Merge branch 'dev_ic_diaodong' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -221,29 +221,29 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 }
                 if (subList.size() > 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.批量新增数据,先删后增【只删除新增节点的历史数据】