修复bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -218,13 +218,14 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userVerifyId",value = "审核id，只有在 userId 参数生效才有效")
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
-    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId,
+    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId, @RequestParam("userVerifyId") Integer userVerifyId,
                                     HttpSession session){
         ResponseBean response = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        response = iTaUserService.getUserInfo(userElement,userId);
+        response = iTaUserService.getUserInfo(userElement,userId, userVerifyId);
         if ("1".equals(response.getCode())) {
             // 清空 session
             removeUserElement(session);

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -4,6 +4,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaUserVerify;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -29,14 +31,68 @@ public interface TaUserVerifyMapper {
     List<TaUserVerify> selectByUserId(@Param("userId") Integer userId);
 
     /**
-     * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态  进行条件查询
      * @param communityId
      * @param phaseId
      * @param buildingId
      * @param unitId
      * @param levelId
      * @param roomNoId
+     * @param verifyStatus
      * @return
      */
-    TaUserVerify selectCommunityAndAddress(Integer userId,Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,Integer roomNoId);
+    List<TaUserVerify> selectCommunityAndAddress(@Param("userId") Integer userId,
+                                           @Param("communityId") Integer communityId,
+                                           @Param("phaseId") Integer phaseId,
+                                           @Param("buildingId") Integer buildingId,
+                                           @Param("unitId") Integer unitId,
+                                           @Param("levelId") Integer levelId,
+                                           @Param("roomNoId") Integer roomNoId,
+                                           @Param("verifyStatus") Integer verifyStatus);
+
+    /**
+     * 根据 小区id 、 期、栋、单元、楼层、户号, 角色id(业主), 审核通过(值为1) 进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and role_id=1 and verify_status=1")
+    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("communityId") Integer communityId,
+                                                    @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer buildingId,
+                                                    @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer levelId,
+                                                    @Param("roomNoId") Integer roomNoId);
+
+
+    /**
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态(不等于2)  进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where user_id=#{userId} and community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and verify_status != 2")
+    List<TaUserVerify> selectCommunityAndAddressAndNotVerifyStatus2(@Param("userId") Integer userId,
+                                           @Param("communityId") Integer communityId,
+                                           @Param("phaseId") Integer phaseId,
+                                           @Param("buildingId") Integer buildingId,
+                                           @Param("unitId") Integer unitId,
+                                           @Param("levelId") Integer levelId,
+                                           @Param("roomNoId") Integer roomNoId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -134,9 +134,10 @@ public interface ITaUserService {
      *
      * @param userElement 当前用户
      * @param userId      被查询用户, 一般是业主情况下有效, 查的是下面的家属或者租客
+     * @param userVerifyId  审核id 只有在 userId 参数存在的情况才有效
      * @return
      */
-    ResponseBean getUserInfo(UserElement userElement, Integer userId);
+    ResponseBean getUserInfo(UserElement userElement, Integer userId, Integer userVerifyId);
 
     /**
      * 游客登录

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoImpl.java

@@ -25,6 +25,9 @@ import java.util.Map;
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 栋
      */
@@ -102,11 +105,11 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
         Map<String,Object> result = Maps.newHashMap();
 
-        // TODO 楼栋资料库查询有变动
         // 2.检验这个户号是否关联了 户主
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
-        if (null != tpBuildingOwnerInfo) {
-            result.put("ownerName",tpBuildingOwnerInfo.getOwnerName());
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
+        if (null != ownerUserVerify) {
+            TaUser user = taUserMapper.selectByPrimaryKey(ownerUserVerify.getUserId());
+            result.put("ownerName",user.getUserName());
             result.put("roleName", "OWNER");
             responseBean.addSuccess(result);
             return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -217,16 +217,16 @@ public class FaceServicelimpl implements FaceServiceI {
      */
     public TaUserVerify getTaFaceParentId(UserElement userElement, Integer otherUserId) {
         // 根据 家属/租客 的id， 和 当前的房产信息进行查询是否有值，有值就说明是 家属/租客
-        TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+        List<TaUserVerify> todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), 1);
         // 判断 家属或者租客 属不属于这个业主的下面
-        if (null == todUserVerify) {
-            throw new WisdomException("您输入的家属或租户ID有误");
+        if (null == todUserVerify || todUserVerify.size() == 0) {
+            throw new WisdomException("您输入的家属或租户ID有误或审核未通过！");
         }
-        if (!Constant.VERIFY_STATUS.equals(todUserVerify.getVerifyStatus())) {
+        if (!Constant.VERIFY_STATUS.equals(todUserVerify.get(0).getVerifyStatus())) {
             throw new WisdomException("用户房产审核未通过！");
         }
 
-        return todUserVerify;
+        return todUserVerify.get(0);
     }
 
     /**

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -812,7 +812,7 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    public ResponseBean getUserInfo(UserElement userElement, Integer userId) {
+    public ResponseBean getUserInfo(UserElement userElement, Integer userId, Integer userVerifyId) {
 
         ResponseBean response = new ResponseBean();
 
@@ -838,15 +838,20 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 查询 家属或者租客
         if (null != userId) {
-            TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+            List<TaUserVerify> todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), null);
             // 判断 家属或者租客 属不属于这个业主的下面
-            if (null == todUserVerify) {
+            if (null == todUserVerify || todUserVerify.size() == 0) {
+                response.addError("您的下面没有该家属或者租客!");
+                return response;
+            }
+            boolean anyMatch = todUserVerify.stream().anyMatch(e -> e.getId().intValue() == userVerifyId.intValue());
+            if (!anyMatch) {
                 response.addError("您的下面没有该家属或者租客!");
                 return response;
             }
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
-            todUser.setUserVerifyId(todUserVerify.getId());
-            todUser.setCommunityId(todUserVerify.getCommunityId());
+            todUser.setUserVerifyId(userVerifyId);
+            todUser.setCommunityId(userElement.getCommunityId());
             user = todUser;
         }
 
@@ -1062,9 +1067,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
         TaUserVO userVO = new TaUserVO();
         BeanTools.copyProperties(user, userVO);
-        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(user.getId(), userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
-        if (null != userVerify) {
-            TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddress(user.getId(), userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), 1);
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            TaFace face = taFaceMapper.getByUserVerifyId(userVerifyList.get(0).getId());
             if (null == face) {
                 userVO.setFace("register");
             } else {

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServicelmpl.java

@@ -105,6 +105,16 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         String roleName = jsonObject.getString("roleName");
         TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
 
+        // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(), userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+                userElement.getLevelId(), userElement.getRoomNoId());
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            responseBean.addError("您已提交了这个房产的审核！请等待业主或者物业审核后，在进行下一步操作！");
+            return responseBean;
+        }
+
+
         // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
         TpPhase phase = tpPhaseMapper.selectByPrimaryKey(taUserVerify.getPhaseId());
         TpBuilding building = tpBuildingMapper.selectByPrimaryKey(taUserVerify.getBuildingId());

CODE/smart-community/app-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -260,5 +260,9 @@
     and unit_id = #{unitId,jdbcType=INTEGER}
     and level_id = #{levelId,jdbcType=INTEGER}
     and room_no_id = #{roomNoId,jdbcType=INTEGER}
+    <if test="verifyStatus != null and verifyStatus != ''">
+      and verify_status = #{verifyStatus}
+    </if>
+
   </select>
 </mapper>

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -4,6 +4,12 @@
       <el-form-item label="手机号" prop="ownerTel" placeholder="手机号">
         <span>{{ ownerTel }}</span>
       </el-form-item>
+      <el-form-item>
+        <span style="color: #99a9bf;">
+          若想修改业主登录手机号，需要业主自己登录APP在个人中心修改。或者联系荟房网络运营人员核实后修改，因为此手机号可能在其他社区在用。
+          若想修改成员为其他成员的手机号，请删除此成员后添加新成员。
+        </span>
+      </el-form-item>
       <el-form-item label="身份" prop="roleId">
         <el-select v-model="listQuery.roleId" placeholder="身份">
           <el-option :disabled="roleDisabled" label="业主" value="1" />