From 540340b2fabf26b5e0af27cab14ccb249b089fb5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 10 Oct 2024 17:57:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E5=85=B3=E8=81=94=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../planchange/service/ProcessPlanChangeLinkService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java index 2ffb9f3f..c89aa75b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/planchange/service/ProcessPlanChangeLinkService.java @@ -40,8 +40,10 @@ public class ProcessPlanChangeLinkService extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(processPlanChangeLink, req.getParameterMap()); Page pageList = this.page(page, queryWrapper); List records = pageList.getRecords(); - String userIds = records.stream().map(ProcessPlanChangeLink::getMainDraftingUser).collect(Collectors.joining(",")); - List dictModels = sysBaseAPI.translateDictFromTableByKeys("sys_user", "email", "id", userIds); + List userIds = records.stream().map(ProcessPlanChangeLink::getMainDraftingUser).collect(Collectors.toList()); + List userId1s = records.stream().map(ProcessPlanChangeLink::getDraftingUserNew).collect(Collectors.toList()); + userIds.addAll(userId1s); + List dictModels = sysBaseAPI.translateDictFromTableByKeys("sys_user", "email", "id", String.join(",",userIds)); Map userMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); for (ProcessPlanChangeLink record : records) { String mainDraftingUser = record.getMainDraftingUser();