From 5ed02f594bb78a662d0e6a98dfd7a17b96d1cf5e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 3 Feb 2022 23:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=201.=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=91=E7=94=9F=E8=B0=83?= =?UTF-8?q?=E5=8A=A8=E5=8A=A8=E4=BD=9C=EF=BC=8C=E9=99=84=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E5=A4=9A=E4=BD=99=E7=B1=BB=E5=88=AB=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserImportServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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