From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 145ecda..57776ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -99,8 +99,10 @@
*/
@PostMapping("/getUsersByDeptId")
R<List<SysUser>> getUsersByDeptId(@RequestBody Long deptId){
- List<SysUser> list = userService.list(new QueryWrapper<SysUser>().eq("dept_id", deptId).eq("del_flag", 0));
- return R.ok(list);
+ SysUser sysUser = new SysUser();
+ sysUser.setDeptId(deptId);
+ List<SysUser> sysUsers = userService.selectUserList(sysUser);
+ return R.ok(sysUsers);
}
@@ -474,4 +476,14 @@
qwH5LoginVo.setSysUser(sysUser);
return R.ok(qwH5LoginVo);
}
+
+
+ /**
+ * 获取当前用户权限范围内的员工id
+ * @return
+ */
+ @PostMapping("/getScopeOfAuthorityUserId")
+ public List<Long> getScopeOfAuthorityUserId(){
+ return userService.getScopeOfAuthorityUserId();
+ }
}
--
Gitblit v1.7.1