From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 801957e..5f6f39b 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
@@ -1,5 +1,6 @@
package com.ruoyi.system.controller.sys;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -89,6 +90,20 @@
}).collect(Collectors.toList());
return R.ok(userIds);
}
+
+
+ /**
+ * 根据部门id获取用户列表
+ * @param deptId
+ * @return
+ */
+ @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);
+ }
+
+
/**
* 获取用户列表
@@ -347,7 +362,6 @@
/**
* 获取部门树列表
*/
- @RequiresPermissions("system:user:list")
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept)
{
@@ -460,4 +474,14 @@
qwH5LoginVo.setSysUser(sysUser);
return R.ok(qwH5LoginVo);
}
+
+
+ /**
+ * 获取当前用户权限范围内的员工id
+ * @return
+ */
+ @PostMapping("/getScopeOfAuthorityUserId")
+ public List<Long> getScopeOfAuthorityUserId(){
+ return userService.getScopeOfAuthorityUserId();
+ }
}
--
Gitblit v1.7.1