From 5f7ec056a75d54440104951f0e0b9007676df051 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 8 Sep 2025 09:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysMenuController.java  | 26 +++++++++++++++++++
 .../resources/mapper/system/SysUserMapper.xml | 13 ++++++++++
 2 files changed, 39 insertions(+)

diff --git a/bonus-base/src/main/java/com/bonus/base/controller/system/SysMenuController.java b/bonus-base/src/main/java/com/bonus/base/controller/system/SysMenuController.java
index 48fc84a..e82f687 100644
--- a/bonus-base/src/main/java/com/bonus/base/controller/system/SysMenuController.java
+++ b/bonus-base/src/main/java/com/bonus/base/controller/system/SysMenuController.java
@@ -64,6 +64,18 @@ public class SysMenuController extends BaseController
         return success(menuService.buildMenuTreeSelect(menus));
     }
 
+    /**
+     * 获取菜单下拉树列表 -新增，不使用树结构
+     */
+    @GetMapping("/treeselectNew")
+    public AjaxResult treeselectNew(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menus);
+    }
+
+
+
     /**
      * 加载对应角色菜单列表树
      */
@@ -77,6 +89,20 @@ public class SysMenuController extends BaseController
         return ajax;
     }
 
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselectNew/{roleId}")
+    public AjaxResult roleMenuTreeselectNew(@PathVariable("roleId") Long roleId)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menus);
+        return ajax;
+    }
+
     /**
      * 新增菜单
      */
diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 887eafa..454b7d5 100644
--- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -59,6 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		<if test="roleId !=null and userId != 0 and status != '' " >
+			left join sys_user_role ur on u.user_id = ur.user_id
+			left join sys_role r on r.role_id = ur.role_id
+		</if>
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
@@ -81,6 +85,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+
+		<if test="roleId !=null and userId != 0 and status != '' " >
+			and r.role_id = #{roleId}
+		</if>
+
+		<if test="roleId !=null and userId != 0 and status != '' " >
+			GROUP BY u.user_id
+		</if>
+
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>