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

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

@@ -381,30 +381,42 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             responseBean.addError("操作失败！");
             return responseBean;
         }
-        
-        // 查询是否有相同的房间号
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getOrgId(), taUserVerify.getPhaseId(),
-                taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
-                taUserVerify.getLevelId(), taUserVerify.getRoomNoId(),
-                taUserVerify.getPhone());
-        if (null != tpBuildingOwnerInfo){
-            // 自动审核通过
-            tpBuildingOwnerInfo.setPairStatus("1");
-            tpBuildingOwnerInfo.setVerifyStatus("1");
-            tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-            tpBuildingOwnerInfo.setCreateUser(-1);
-            tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
-            tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
-
-            taUserVerify.setVerifyStatus("1");
-            taUserVerify.setVerifyName("自动审核通过");
-            taUserVerifyMapper.updateById(taUserVerify);
-
-            TaPerson taPerson = taPersonMapper.selectById(personId);
-            taPerson.setName(taUserVerify.getOwnerName());
-            taPersonMapper.updateById(taPerson);
 
+        // 户主自动审核
+        if (Constant.OWNER.equals(roleName)){
+            // 查看是否有审核通过的业主
+            TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(taUserVerify.getOrgId(), taUserVerify.getPhaseId(),
+                    taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
+                    taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != userVerify) {
+                responseBean.addSuccess(taUserVerify);
+                return responseBean;
+            }
+            // 查询是否有相同的房间号
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getOrgId(), taUserVerify.getPhaseId(),
+                    taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
+                    taUserVerify.getLevelId(), taUserVerify.getRoomNoId(),
+                    taUserVerify.getPhone());
+            if (null != tpBuildingOwnerInfo){
+                // 自动审核通过
+                tpBuildingOwnerInfo.setPairStatus("1");
+                tpBuildingOwnerInfo.setVerifyStatus("1");
+                tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
+                tpBuildingOwnerInfo.setCreateUser(-1);
+                tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
+                tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+
+                taUserVerify.setVerifyStatus("1");
+                taUserVerify.setVerifyName("自动审核通过");
+                taUserVerifyMapper.updateById(taUserVerify);
+
+                TaPerson taPerson = taPersonMapper.selectById(personId);
+                taPerson.setName(taUserVerify.getOwnerName());
+                taPersonMapper.updateById(taPerson);
+
+            }
         }
+
 //        // 推送消息
 //        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
 //        if (null != userVerify){