迁入管理

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

@@ -172,7 +172,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
         }
 
         //4.勾选了补充居民信息且选择了更新信息的
-        if ("1".equals(formDTO.getIsCheck()) && "1".equals(formDTO.getIsReplace())) {
+        if ("1".equals(formDTO.getIsCheck())) {
             IcResiUserTransferFormDTO change = new IcResiUserTransferFormDTO();
             change.setType("in");
             change.setNewAgencyId(staffInfo.getAgencyId());
@@ -186,9 +186,10 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
             change.setCustomerId(formDTO.getCustomerId());
             change.setStaffId(formDTO.getUserId());
             IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiUserEntity.class);
-            //4-1.本社区下正常状态居民且房屋不一样【只更新居民信息，生成变更记录，不生成变更明细】
+            //4-1.本社区下正常状态居民且房屋不一样并选择了更新【只更新居民信息，生成变更记录，不生成变更明细】
             if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())
-                    && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())) {
+                    && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
+                    && "1".equals(formDTO.getIsReplace())) {
                 entity.setId(resiDTO.getIcResiUserId());
                 icResiUserService.updateById(entity);
                 change.setOrigin("change");