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();