Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -340,14 +340,15 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             return responseBean;
         }
 
-        // 校验是否有审核通过的业主
-        TaUserVerify hasUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-        if (null != hasUserVerify) {
-            responseBean.addError("此房产已存在户主!");
-            return responseBean;
+        if (Constant.OWNER.equals(roleName)){
+            // 校验是否有审核通过的业主
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != hasUserVerify) {
+                responseBean.addError("此房产已存在户主!");
+                return responseBean;
+            }
         }
 
-
         // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
         List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(taUserVerify.getPersonId(), taUserVerify.getOrgId(),
                 taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),