提交

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

@@ -495,10 +495,17 @@ public class TaUserServiceImpl implements ITaUserService {
         // 查询出当前 业主的楼栋信息
         TaUserVerify userElementUserVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
 
+        // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(user.getId(), userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+                userElement.getLevelId(), userElement.getRoomNoId());
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            response.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，在进行下一步操作！");
+            return response;
+        }
 
         // 开始存入审核表
         TaUserVerify userVerify = new TaUserVerify();
-        userVerify.setVerifyStatus("1");
         userVerify.setCommunityId(userElement.getCommunityId());
         userVerify.setRoleId(sysRole.getId());
         userVerify.setUserId(user.getId());
@@ -512,6 +519,8 @@ public class TaUserServiceImpl implements ITaUserService {
         userVerify.setLevelName(userElementUserVerify.getLevelName());
         userVerify.setRoomNoId(userElementUserVerify.getRoomNoId());
         userVerify.setRoomNoName(userElementUserVerify.getRoomNoName());
+        userVerify.setVerifyStatus("1");
+        userVerify.setCreateDate(new Date());
 
         taUserVerifyMapper.insertSelective(userVerify);
 
@@ -1089,14 +1098,16 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 被删除的房产（也就是家属或者租客 在审核表里面的id）
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError("房产不存在！");
+            return responseBean;
+        }
 
-        // TODO 楼栋资料库查询有变动
-        // 查询出要被删除的房产的 楼栋资料信息
-        TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
-        TaUser currentUser = hasUserPhone(buildingOwnerInfo.getOwnerTel());
+        // 业主的
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
 
         // 如果业主删除房屋成员(也就是删除房产审核)，房产的业主id 和 当前登录的业主的id，相等的时候才允许删除(相等才能表示是这个业主的房产)
-        if (currentUser.getId().intValue() == userElement.getId()) {
+        if (ownerUserVerify.getUserId().intValue() == userElement.getId()) {
             taUserVerifyMapper.deleteByPrimaryKey(userVerifyId);
         }