From f18bb7b8cababf53a398f493cfaf9af1019beec9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 25 Apr 2023 15:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?customerId=EF=BC=8CstaffId=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index c49ecc7554..7b9434043a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -708,7 +708,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             throw new RenException(String.format("居民信息修改，获取基础信息失败，基础信息Id->", resiUserId));
         }
         //2022-1-18 信息修改判断基础信息表人员网格、小区、楼栋、单元、房屋维度数据以及十八类的类别数据是否变化，相应生成变更记录和变更明细数据  sun  start
-        icUserChangeRecord(tokenDto, entity, map);
+        icUserChangeRecord(entity, map);
         //2022-1-18  sun end
         //2.更新主表数据
         if (map.size() > NumConstant.ONE) {
@@ -789,10 +789,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @Author sun
-     * @Description 居民信息修改--生成变更记录和变更明细
-     **/
-    private void icUserChangeRecord(TokenDto tokenDto, IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+     * @description: 生成居民变更记录
+     * @param null:
+     * @return
+     * @author: sun
+     */
+    public void icUserChangeRecord(IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+        // prepare
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        String staffId = EpmetRequestHolder.getLoginUserId();
+
         java.util.Date date = new java.util.Date();
         //1.判断维度数据是否修改【网格、小区、楼栋、单元、房间有变化则先走人员调动逻辑】
         if ((map.containsKey("GRID_ID") && !entity.getGridId().equals(map.get("GRID_ID"))) || (map.containsKey("VILLAGE_ID") && !entity.getVillageId().equals(map.get("VILLAGE_ID")))
@@ -809,13 +815,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             formDTO.setNewHouseId(map.containsKey("HOME_ID") ? map.get("HOME_ID") : entity.getHomeId());
             formDTO.setTransferTime(date);
             formDTO.setIdEdit(false);
-            formDTO.setCustomerId(tokenDto.getCustomerId());
-            formDTO.setStaffId(tokenDto.getUserId());
+            formDTO.setCustomerId(customerId);
+            formDTO.setStaffId(staffId);
             icUserTransferRecordService.add(formDTO);
         }
         //2.判断类别数据是否修改[类别修改的变更明细里边存修改后的新值，是就存1否就存-1]
         IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
-        sfdto.setCustomerId(tokenDto.getCustomerId());
+        sfdto.setCustomerId(customerId);
         Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto);
         if (!categoryListResult.success()) {
             throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败");
@@ -840,7 +846,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 afterChangeName.append(dto.getLabel()).append(":").append("1".equals(newVlaue) ? "是" : "否").append(";");
                 //变更明细里边存修改后的新值，是就存1否就存-1
                 categoryEntity = new IcUserChangeDetailedEntity();
-                categoryEntity.setCustomerId(tokenDto.getCustomerId());
+                categoryEntity.setCustomerId(customerId);
                 categoryEntity.setPids(entity.getPids());
                 categoryEntity.setAgencyId(entity.getAgencyId());
                 categoryEntity.setGridId(map.containsKey("GRID_ID") ? map.get("GRID_ID") : entity.getGridId());
@@ -859,9 +865,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //居民信息修改中有类别修改的才会生成变更记录和变更明细
         if (list.size() > NumConstant.ZERO) {
             //变更记录
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-            changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
-            changeRecordEntity.setOperatorId(tokenDto.getUserId());
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+            changeRecordEntity.setCustomerId(customerId);
+            changeRecordEntity.setOperatorId(staffId);
             changeRecordEntity.setIcUserId(entity.getId());
             changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
             changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName());