ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Echo 2024-04-19 09:52:39 +08:00
commit 08d6a00dd3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
View File

@ -244,9 +244,18 @@ public class LogInstanceServiceImpl implements LogInstanceService {
List<LogFormDO> formList = logFormService.getFormList(workFormIds); List<LogFormDO> formList = logFormService.getFormList(workFormIds);
Map<Long, LogFormDO> formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item)); Map<Long, LogFormDO> formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item));
//查询用户信息列表
List<Long> userIds = records.stream().map(LogInstanceRespVO::getStartUserId).collect(Collectors.toList());
Map<Long, AdminUserDO> userMap = adminUserService.getUserMap(userIds);
//遍历 //遍历
records.forEach(item -> { records.forEach(item -> {
//设置发起人用户名称和头像
AdminUserDO userDO = userMap.get(item.getStartUserId());
item.setStartUserName(userDO.getNickname());
item.setAvatar(userDO.getAvatar());
//设置日志内部分 //设置日志内部分
LogFormDO logFormDO = formMap.get(item.getFormId()); LogFormDO logFormDO = formMap.get(item.getFormId());
List<String> fields = logFormDO.getFields(); List<String> fields = logFormDO.getFields();