绑定房屋后不能再绑定其他房屋

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java

@@ -89,6 +89,16 @@ public class MyHomeServiceImpl implements MyHomeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void registerAndBind(RegisterAndBindFormDTO formDTO) {
+
+        LambdaQueryWrapper<IcResiUserEntity> userWrapper = new LambdaQueryWrapper<>();
+        userWrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
+        userWrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
+        IcResiUserEntity icUser = icResiUserDao.selectOne(userWrapper);
+
+        if (null != icUser && !icUser.getHomeId().equals(formDTO.getHomeId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "已绑定其他房屋", "已绑定其他房屋");
+        }
+
         //进入网格（entergrid）流程
         EnterGridFormDTO userInfoParams = new EnterGridFormDTO();
         userInfoParams.setUserId(formDTO.getUserId());
@@ -140,11 +150,6 @@ public class MyHomeServiceImpl implements MyHomeService {
             userResiInfoService.saveResiInfo(userResiInfoDTO);
         }
         //2.添加ic_resi_user信息
-        LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId());
-        wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
-        IcResiUserEntity icUser = icResiUserDao.selectOne(wrapper);
-
         HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), formDTO.getHomeId());
         if (null == houseInfo) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");