From 13285719f63724bca396a01628d504143f950791 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 6 Dec 2023 09:23:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=80=81=E6=B3=95=E8=A7=84=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E4=B8=AA=E4=BA=BA=E6=9D=83=E9=99=90=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=87=87=E7=94=A8=E5=B7=A5=E5=8F=B7=E5=8C=B9=E9=85=8D=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E7=89=B9=E6=AE=8A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/oldSystem/service/impl/OldSystemServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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()); }