From 481e537d6ca86b07452921c0e2f1a8b623afb318 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 23 Jun 2025 14:49:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/admin/controller/SysDeptController.java   |  3 ---
 .../admin/service/impl/SysDeptServiceImpl.java        | 11 +++--------
 .../src/main/resources/mapper/SysUserMapper.xml       |  7 +++++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java
index e71d2307a..dd3c7ef12 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java
@@ -88,9 +88,6 @@ public class SysDeptController {
 
     /**
      * 返回树形菜单集合
-     *
-     * @param deptName 部门名称
-     * @return 树形菜单
      */
     @GetMapping(value = "/tree")
     public R getTree(String deptName, Long parentId) {
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java
index fed013eda..4110bd2c8 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java
@@ -134,14 +134,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public List<Tree<Long>> selectTree(String deptName, Long parentId) {
         List<SysDept> deptAllList = new ArrayList<>();
-        if (ObjectUtil.isEmpty(parentId)) {
-            // 查询全部部门
-            deptAllList = deptMapper
-                    .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
-        } else {
-            deptAllList = listDescendant(parentId);
-        }
-
+        // 查询全部部门
+        LambdaQueryWrapper<SysDept> queryWrapper = Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName);
+        deptAllList = deptMapper.selectListByScope(queryWrapper, DataScope.of());
         // 查询数据权限内部门
         List<Long> deptOwnIdList = deptMapper
                 .selectListByScope(
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 41a60a494..49847405f 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -267,6 +267,7 @@
         FROM
         sys_user u
         LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
+        LEFT JOIN sys_user_role urole ON urole.user_id = u.user_id
         <where>
             u.del_flag = '0'
             <if test="query.username != null and query.username != ''">
@@ -276,6 +277,12 @@
             <if test="query.deptId != null and query.deptId != ''">
                 AND u.dept_id = #{query.deptId}
             </if>
+            <if test="query.role != null and query.role.size() != 0">
+                and urole.role_id IN
+                <foreach collection="query.role" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
             <if test="query.deptIds != null and query.deptIds.size() != 0">
                 <choose>
                     <when test="query.isInclude != null and query.isInclude == true">