diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java index 54e6aba9..d7dcb3fc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java @@ -535,9 +535,8 @@ public class OldSystemServiceImpl implements OldSystemService { LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); List esList = esService.list(esWrapper.isNotNull(LawsEnterpriseStandard::getOldSystemId)); Map esMap = esList.stream().collect(Collectors.toMap(LawsEnterpriseStandard::getOldSystemId, o -> o)); - Map> auMap = datalist.stream().collect(Collectors.groupingBy(ESAuthUser::getStandardId)); List userlist = sysUserService.list(); - Map userMap = userlist.stream().collect(Collectors.toMap(u -> u.getRealname() + u.getUsername(), o -> o)); + Map 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()); }