From ae7f04be9321ddbe17c46fae8ab05d34e7493f9f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 二月 2025 13:40:06 +0800
Subject: [PATCH] 管理后台bug修改

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
index c08b533..7cc76d5 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java
@@ -41,6 +41,7 @@
 
 import javax.validation.Validator;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -576,7 +577,13 @@
         if (StringUtils.isBlank(treeCode)) {
             return PageDTO.empty(0L, 0L);
         }
-        Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getNickName(), query.getRoleId(), treeCode);
+        Long userId = SecurityUtils.getUserId();
+        SysRole sysRole = roleMapper.selectRoleByUserId(userId);
+        if (Objects.isNull(sysRole)) {
+            throw new ServiceException("当前用户没有角色");
+        }
+        List<Long> roleIdList = Arrays.stream(sysRole.getManageRoleIdStr().split(",")).map(Long::parseLong).collect(Collectors.toList());
+        Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getNickName(), query.getRoleId(), query.getUserName(), treeCode, roleIdList);
         return PageDTO.of(page);
     }
 
@@ -641,6 +648,8 @@
      */
     @Override
     public SysUserVO getDetailInfo(Long userId) {
+        System.out.println("-------------------------------");
+        System.out.println(SecurityUtils.getLoginUser().getUser());
         SysUser sysUser = this.getById(userId);
         SysUserVO sysUserVO = null;
         if (Objects.nonNull(sysUser)) {

--
Gitblit v1.7.1