From 4aee21a14c8ef6586ed5a585a68a6b8815103171 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 Jan 2022 10:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=96=B0=E5=A2=9E=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E6=97=B618?= =?UTF-8?q?=E7=B1=BB=E9=83=BD=E4=B8=BA=E5=90=A6=E7=9A=84=E4=B9=9F=E8=A6=81?= =?UTF-8?q?=E6=9C=89=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8F=AA=E6=98=AF=E6=B2=A1=E6=9C=89=E6=98=8E=E7=BB=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserChangeRecordServiceImpl.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index a2606c3aaa..58c4f2da00 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -221,29 +221,29 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl NumConstant.ZERO) { detailedList.addAll(subList); - if (!hash.containsKey(map.get("CREATED_BY"))) { - CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); - //被删除或被移除的工作人员，名字为空 - hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : ""); - } - change = new IcUserChangeRecordEntity(); - change.setId(changeId); - change.setCustomerId(customerId); - change.setOperatorId(map.get("CREATED_BY")); - change.setIcUserId(map.get("ID")); - change.setOperatorName(hash.get(map.get("CREATED_BY"))); - change.setIcUserName(map.get("NAME")); - change.setType("add"); - change.setTypeName("新增"); - change.setBeforeChangeName("-"); - change.setAfterChangeName("-"); - change.setChangeTime(sdf.parse(map.get("CREATED_TIME"))); - change.setCreatedBy(map.get("CREATED_BY")); - change.setCreatedTime(sdf.parse(map.get("CREATED_TIME"))); - change.setUpdatedBy("APP_USER"); - change.setUpdatedTime(new Date()); - changeList.add(change); } + if (!hash.containsKey(map.get("CREATED_BY"))) { + CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); + //被删除或被移除的工作人员，名字为空 + hash.put(map.get("CREATED_BY"), null != staffInfoCache ? staffInfoCache.getRealName() : ""); + } + change = new IcUserChangeRecordEntity(); + change.setId(changeId); + change.setCustomerId(customerId); + change.setOperatorId(map.get("CREATED_BY")); + change.setIcUserId(map.get("ID")); + change.setOperatorName(hash.get(map.get("CREATED_BY"))); + change.setIcUserName(map.get("NAME")); + change.setType("add"); + change.setTypeName("新增"); + change.setBeforeChangeName("-"); + change.setAfterChangeName("-"); + change.setChangeTime(sdf.parse(map.get("CREATED_TIME"))); + change.setCreatedBy(map.get("CREATED_BY")); + change.setCreatedTime(sdf.parse(map.get("CREATED_TIME"))); + change.setUpdatedBy("APP_USER"); + change.setUpdatedTime(new Date()); + changeList.add(change); } } while (icUserList.size() == NumConstant.ONE_THOUSAND); //4.批量新增数据,先删后增【只删除新增节点的历史数据】