From d5503d0cbe5af548541777a179ee39126b209b36 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 05 三月 2025 12:36:43 +0800 Subject: [PATCH] 转办日志查询bug --- system/src/main/java/com/ycl/system/mapper/SysDeptMapper.java | 2 +- business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java index f67a65e..1031bfa 100644 --- a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java @@ -210,13 +210,13 @@ } } else if (HandlerTypeEnum.USER.equals(handlerType)) { List<SysUser> users = userService.selectUserByIds(ids); - names = users.stream().map(user -> user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "鏃犻儴闂�") + ")").collect(Collectors.toList()); + names.addAll(users.stream().map(user -> user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "鏃犻儴闂�") + ")").collect(Collectors.toList())); } else if (HandlerTypeEnum.DEPT.equals(handlerType)) { List<SysDept> depts = deptService.selectDeptByIds(ids); - names = depts.stream().map(SysDept::getDeptName).collect(Collectors.toList()); + names.addAll(depts.stream().map(SysDept::getDeptName).collect(Collectors.toList())); } else if (HandlerTypeEnum.ROLE.equals(handlerType)) { List<SysRole> roles = roleService.selectRoleByIds(ids); - names = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList()); + names.addAll(roles.stream().map(SysRole::getRoleName).collect(Collectors.toList())); } } } diff --git a/system/src/main/java/com/ycl/system/mapper/SysDeptMapper.java b/system/src/main/java/com/ycl/system/mapper/SysDeptMapper.java index 87948b6..3859b4d 100644 --- a/system/src/main/java/com/ycl/system/mapper/SysDeptMapper.java +++ b/system/src/main/java/com/ycl/system/mapper/SysDeptMapper.java @@ -38,7 +38,7 @@ */ public SysDept selectDeptById(Long deptId); - List<SysDept> selectDeptByIds(List<Long> deptIds); + List<SysDept> selectDeptByIds(@Param("deptIds") List<Long> deptIds); /** * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬 -- Gitblit v1.8.0