From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 201d591..9551192 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -13,11 +14,7 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
@@ -32,6 +29,7 @@
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -47,6 +45,8 @@
@Autowired
private SysUserMapper userMapper;
+ @Autowired
+ private TDeptMapper deptMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -643,6 +643,23 @@
if(CollectionUtils.isEmpty(list)){
return pageInfo;
}
+ Map<Integer, TDept> deptMap = deptMapper.selectList(null).stream()
+ .collect(Collectors.toMap(TDept::getId, e->e));
+ for (SysUserVO sysUserVO : list) {
+ StringBuilder deptName = new StringBuilder();
+ TDept tDept = deptMap.get(Integer.valueOf(sysUserVO.getDeptId()));
+ if (tDept!=null){
+ deptName.append(tDept.getDeptName());
+ while (tDept.getParentId()!=0){
+ tDept = deptMap.get(tDept.getParentId());
+ if (tDept!=null){
+ deptName.append("-").append(tDept.getDeptName());
+ }else{
+ break;
+ }
+ }
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -706,4 +723,34 @@
public List<SysUser> selectListByUserIds(List<Integer> userIds) {
return userMapper.selectListByUserIds(userIds);
}
+
+ @Override
+ public PageInfo<SysUserVO> listByDeptId(Integer deptId, Integer pageNum, Integer pageSize) {
+ PageInfo<SysUserVO> pageInfo = new PageInfo<>(pageNum, pageSize);
+ List<SysUserVO> list = userMapper.listByDeptId(deptId,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ Map<Integer, TDept> deptMap = deptMapper.selectList(null).stream()
+ .collect(Collectors.toMap(TDept::getId, e->e));
+ for (SysUserVO sysUserVO : list) {
+ StringBuilder deptName = new StringBuilder();
+ TDept tDept = deptMap.get(Integer.valueOf(sysUserVO.getDeptId()));
+ if (tDept!=null){
+ deptName.append(tDept.getDeptName());
+ while (tDept.getParentId()!=0){
+ tDept = deptMap.get(tDept.getParentId());
+ if (tDept!=null){
+ deptName.append("-").append(tDept.getDeptName());
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+
}
--
Gitblit v1.7.1