commit

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -303,10 +303,10 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
                 userPatUpService.renewUserState();
 
                 // 修改不在人事库的人员，删除角色
-//            userPatUpService.deleteNotInSourceUser(true);
+//                userPatUpService.deleteNotInSourceUser(true);
                 //清除缓存
-                sysUserService.clearCache();
-                sysRoleService.clearCache();
+//                sysUserService.clearCache();
+//                sysRoleService.clearCache();
 
             } else {
                 List<String> loginNameList = middleTables.stream().map(SourceChangeMiddleTable::getLoginname).toList();
@@ -529,7 +529,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
         // 变更记录
         List<NutMap> changeList = new ArrayList<>();
         for (String fieldName : allowChangeFieldNames) {
-            if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate")) {
+            if (List.of("retireDate", "welfareStopDate").contains(fieldName)) {
                 continue;
             }
             memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);
@@ -577,7 +577,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
         NutMap sourceMap = Lang.obj2nutmap(user);
         List<NutMap> changeList = new ArrayList<>();
         for (String fieldName : allowChangeFieldNames) {
-            if (allowChangeFieldNames.contains("retireDate") || allowChangeFieldNames.contains("welfareStopDate")) {
+            if (List.of("retireDate", "welfareStopDate").contains(fieldName)) {
                 continue;
             }
             memberCommonService.extractChange(newMap, sourceMap, fieldName, dictMap, changeList);