diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 5bb39530f9..71e0e0d9ca 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1211,7 +1211,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res Map newCategories = transferedData.getNewData().getCategories(); Map oldCategories = transferedData.getOldData().getCategories(); - oldCategories.put(columnName, "0"); + String oldValue = resiInfoMap.get(columnName); + if (StringUtils.isBlank(oldValue)) { + oldValue = "0"; + } + + oldCategories.put(columnName, oldValue); newCategories.put(columnName, "1"); return; } @@ -1371,8 +1376,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ public void saveTransferedResiRecord(Map transferedResis) { Date now = new Date(); + String customerId = loginUserUtil.getLoginUserCustomerId(); + CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId()); + for (Map.Entry resi : transferedResis.entrySet()) { - String customerId = loginUserUtil.getLoginUserCustomerId(); String resiId = resi.getKey(); ResiImportCategoryData oldData = resi.getValue().getOldData(); @@ -1478,8 +1485,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } } - CustomerStaffInfoCacheResult operator = CustomerStaffRedis.getStaffInfo(customerId, loginUserUtil.getLoginUserId()); - IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId); // 保存 transferRecord