换下顺序

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

@@ -191,26 +191,27 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
                     && "0".equals(resiDTO.getStatus()) && !resiDTO.getResiHomeId().equals(formDTO.getHomeId())
                     && "1".equals(formDTO.getIsReplace())) {
                 entity.setId(resiDTO.getIcResiUserId());
-                icResiUserService.updateById(entity);
                 change.setOrigin("change");
                 change.setIcUserId(entity.getId());
+                //先加记录，再修改，否则找不到原房屋
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
                 //4-2.本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
                 entity.setId(resiDTO.getIcResiUserId());
-                icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
                 change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
             } else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
                 //4-3.非本社区下游离状态居民【更新居民信息，生成变更记录、变更明细】
                 entity.setId(resiDTO.getIcResiUserId());
                 entity.setAgencyId(staffInfo.getAgencyId());
                 entity.setPids(staffInfo.getAgencyPIds());
-                icResiUserService.updateById(entity);
                 change.setIcUserId(entity.getId());
                 change.setOrigin("in");
                 icUserTransferRecordService.moveResi(change);
+                icResiUserService.updateById(entity);
             } else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
                 //4-4.客户下不存在的居民(新数据)【新增居民信息，不生成变更记录、变更明细(因为十八类默认都是否)】
                 entity.setAgencyId(staffInfo.getAgencyId());