QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 年度制修订计划流程关联标准 查询报错

Browse Source
This commit is contained in:
lijiarao
2024-09-27 10:45:41 +08:00
parent 5893182257
commit af0b232a25
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+4 -1
View File
@@ -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);
laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+6 -3
View File
@@ -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<ProcessAnnualInitL
public IPage<ProcessAnnualInitLink> pageList(Page<ProcessAnnualInitLink> page, ProcessAnnualInitLink processAnnualInitLink, HttpServletRequest req) {
QueryWrapper<ProcessAnnualInitLink> queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap());
Page<ProcessAnnualInitLink> pageList = this.page(page, queryWrapper);
List<DictModel> dictModels = sysBaseAPI.queryFilterTableDictInfo("sys_user", "email", "id", "");
Map<String, String> userMap = CollStreamUtil.toMap(dictModels, DictModel::getText, DictModel::getValue);
for (ProcessAnnualInitLink record : pageList.getRecords()) {
List<ProcessAnnualInitLink> records = pageList.getRecords();
String userIds = records.stream().map(ProcessAnnualInitLink::getMainDraftingUser).collect(Collectors.joining(","));
List<DictModel> dictModels = sysBaseAPI.translateDictFromTableByKeys("sys_user", "email", "id", userIds);
Map<String, String> 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));