From af0b232a2513f6130cd3f67820b21ace317960c1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 27 Sep 2024 10:45:28 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/aspect/DictAspect.java | 5 ++++- .../annualinit/service/ProcessAnnualInitLinkService.java | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/DictAspect.java index 42b8cfb1..22975e47 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/DictAspect.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/DictAspect.java @@ -302,7 +302,10 @@ public class DictAspect { String[] arr = dictCode.split(","); String table = arr[0]; String text = arr[1]; - String code = arr[2]; + for (int i = 2; i < arr.length - 1; i++) { + text += "," + arr[i]; + } + String code = arr[arr.length - 1]; String values = String.join(",", needTranslDataTable); log.info("translateDictFromTableByKeys.dictCode:" + dictCode); log.info("translateDictFromTableByKeys.values:" + values); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java index 82406210..120afa83 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java @@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 年度制修订计划流程关联标准(ProcessAnnualInitLink)表服务实现类 @@ -38,9 +39,11 @@ public class ProcessAnnualInitLinkService extends ServiceImpl pageList(Page page, ProcessAnnualInitLink processAnnualInitLink, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap()); Page pageList = this.page(page, queryWrapper); - List dictModels = sysBaseAPI.queryFilterTableDictInfo("sys_user", "email", "id", ""); - Map userMap = CollStreamUtil.toMap(dictModels, DictModel::getText, DictModel::getValue); - for (ProcessAnnualInitLink record : pageList.getRecords()) { + List records = pageList.getRecords(); + String userIds = records.stream().map(ProcessAnnualInitLink::getMainDraftingUser).collect(Collectors.joining(",")); + List dictModels = sysBaseAPI.translateDictFromTableByKeys("sys_user", "email", "id", userIds); + Map userMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + for (ProcessAnnualInitLink record : records) { String mainDraftingUser = record.getMainDraftingUser(); String email = userMap.get(mainDraftingUser); record.setEmail(PasswordUtil.decrypt(email));