diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 800c03ddec..87845f425c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -441,9 +441,25 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl getNewHouseInfo(IcResiUserTransferFormDTO formDTO) { Result result2 = new Result<>(); - if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) - || IcResiUserConstant.IN.equals(formDTO.getOrigin()) + if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) && "in".equals(formDTO.getType())) { + //迁出且类型为 迁出到本客户内的,才会查询新的房屋信息;迁出到其他的不查询 + IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); + orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); + orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); + orgMsgFormDTO2.setGridId(formDTO.getNewGridId()); + orgMsgFormDTO2.setNeighborHoodId(formDTO.getNewNeighborHoodId()); + orgMsgFormDTO2.setBuildingId(formDTO.getNewBuildingId()); + orgMsgFormDTO2.setBuildingUnitId(formDTO.getNewBuildingUnitId()); + orgMsgFormDTO2.setHouseId(formDTO.getNewHouseId()); + result2 = govOrgOpenFeignClient.icResiUserOrgMsg(orgMsgFormDTO2); + if (!result2.success() || null == result2.getData().getAgencyDTO() || null == result2.getData().getGridDTO() || null == result2.getData().getNeighborHoodDTO() + || null == result2.getData().getBuildingDTO() || null == result2.getData().getBuildingUnitDTO() || null == result2.getData().getHouseDTO()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查找迁入后的组织、网格、小区、楼栋、单元、房屋信息失败", "迁出至的房屋信息异常"); + } + } + if (IcResiUserConstant.IN.equals(formDTO.getOrigin()) || IcResiUserConstant.BIRTH.equals(formDTO.getOrigin())) { + //出生管理、迁入管理的查询当前选择的房屋信息 IcResiUserOrgMsgFormDTO orgMsgFormDTO2 = new IcResiUserOrgMsgFormDTO(); orgMsgFormDTO2.setCustomerId(formDTO.getCustomerId()); orgMsgFormDTO2.setAgencyId(formDTO.getNewAgencyId()); @@ -455,7 +471,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl