feat: 老法规企标个人权限导入采用工号匹配避免特殊名称

2023-12-06 09:23:24 +08:00
parent 642e78eb1f
commit 13285719f6
1 changed files with 2 additions and 3 deletions
@@ -535,9 +535,8 @@ public class OldSystemServiceImpl implements OldSystemService {
            LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
            List<LawsEnterpriseStandard> esList = esService.list(esWrapper.isNotNull(LawsEnterpriseStandard::getOldSystemId));
            Map<String, LawsEnterpriseStandard> esMap = esList.stream().collect(Collectors.toMap(LawsEnterpriseStandard::getOldSystemId, o -> o));
-            Map<String, List<ESAuthUser>> auMap = datalist.stream().collect(Collectors.groupingBy(ESAuthUser::getStandardId));
            List<SysUser> userlist = sysUserService.list();
-            Map<String, SysUser> userMap = userlist.stream().collect(Collectors.toMap(u -> u.getRealname() + u.getUsername(), o -> o));
+            Map<String, SysUser> userMap = userlist.stream().collect(Collectors.toMap(u -> u.getUsername().trim(), o -> o));

            // 构造一个2099-12-31的Date时间
            Calendar calendar = Calendar.getInstance();
@@ -563,7 +562,7 @@ public class OldSystemServiceImpl implements OldSystemService {
                    }
                    String standardId = es.getId();
                    // 获取用户
-                    SysUser user = userMap.get(au.getRealName() + au.getWorkNumber());
+                    SysUser user = userMap.get(au.getWorkNumber().trim());
                    if (user == null) {
                        throw new JeroBootException("未找到该用户，姓名：" + au.getRealName() + "，工号：" + au.getWorkNumber() + "老标准编号：" + au.getStandardNumber());
                    }