From b7b10f78abc7ba462e5c602ba7e70d4739e316b8 Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期二, 24 六月 2025 09:00:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 36104d6..63f611b 100644 --- a/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/eims/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -64,6 +64,16 @@ return userService.selectPageUserList(user, pageQuery); } + + /** + * 鑾峰彇鐢ㄦ埛鍒楄〃 + */ + @SaCheckPermission("system:user:list") + @GetMapping("/deptRoleUser") + public R<List<SysUserVo>> deptRoleUser(SysUserBo user) { + return R.ok(userService.selectDeptRoleUserList(user)); + } + /** * 瀵煎嚭鐢ㄦ埛鍒楄〃 */ -- Gitblit v1.9.3