提交

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

@@ -233,6 +233,10 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             responseBean.addError("该审核不存在！");
             return responseBean;
         }
+        if (userVerify.getRoleId().intValue() == 1) {
+            responseBean.addError("不能审核业主！");
+            return responseBean;
+        }
         if (!Constant.TO_AUDIT.equals(userVerify.getVerifyStatus())) {
             responseBean.addError("只能审核待审状态！");
             return responseBean;

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

@@ -370,6 +370,7 @@
 	AND tuv.`level_id` = #{levelId}
 	AND tuv.room_no_id = #{roomNoId}
 	AND tuv.user_id != #{userId}
+	AND tuv.role_id != 1
   </select>
 
   <select id="selectTaFaceParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >

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

@@ -45,7 +45,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     TaUserVerify selectCommunityAndAddress(@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 进行条件查询出
+     * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号、角色id 进行条件查询出
      * @param communityId
      * @param phaseId
      * @param buildingId
@@ -54,7 +54,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param roomNoId
      * @return
      */
-    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, @Param("roleId") Integer roleId);
+    TaUserVerify selectCommunityAndAddressAndRoleId(@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("roleId") Integer roleId);
 
 
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -88,23 +88,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             return responseBean;
         }
 
-        // 校验这个房产有没有业主，只能存在一个业主
-        TaUserVerify hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(),
-                userVerify.getBuildingId(), userVerify.getUnitId(),
-                userVerify.getLevelId(), userVerify.getRoomNoId());
-        if (null != hasUserVerify) {
-            responseBean.addError("已经存在审核通过的业主！");
-            return responseBean;
-        }
-
-        // 校验当前身份 和 角色，是否有审核通过的！
-        hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(), userVerify.getPhaseId(),
-                userVerify.getBuildingId(), userVerify.getUnitId(),
-                userVerify.getLevelId(), userVerify.getRoomNoId(), userVerify.getRoleId());
-        if (null != hasUserVerify) {
-            responseBean.addError("在当前房产中已存在这个身份！");
-            return responseBean;
-        }
+        // 校验房产
+        hasUserVerify(userElement, userVerify, true);
 
         User user = userMapper.selectById(userElement.getId());
         String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
@@ -127,6 +112,33 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         return responseBean;
     }
 
+    /**
+     * 校验这个房产
+     * @param userElement
+     * @param userVerify
+     * @param hasOwner 是否执行业主校验
+     */
+    private void hasUserVerify(UserElement userElement, TaUserVerify userVerify, boolean hasOwner){
+        TaUserVerify hasUserVerify = null;
+        // 校验这个房产有没有业主，只能存在一个业主
+        if (hasOwner) {
+            hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(),
+                    userVerify.getBuildingId(), userVerify.getUnitId(),
+                    userVerify.getLevelId(), userVerify.getRoomNoId());
+            if (null != hasUserVerify) {
+                throw new WisdomException("已经存在审核通过的业主！");
+            }
+        }
+
+        // 校验当前身份 和 角色，是否有审核通过的！
+        hasUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userVerify.getUserId(), userVerify.getCommunityId(), userVerify.getPhaseId(),
+                userVerify.getBuildingId(), userVerify.getUnitId(),
+                userVerify.getLevelId(), userVerify.getRoomNoId(), userVerify.getRoleId());
+        if (null != hasUserVerify) {
+            throw new WisdomException("在当前房产中已存在这个身份！");
+        }
+    }
+
     /**
      * 插入楼栋资料库
      *

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

@@ -53,6 +53,7 @@
         and level_id = #{levelId,jdbcType=INTEGER}
         and room_no_id = #{roomNoId,jdbcType=INTEGER}
         and verify_status = 1
+        and user_id = #{userId}
         and role_id = #{roleId}
     </select>
 </mapper>