From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 16:41:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index 1f499f6..f21d495 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -53,9 +53,10 @@
@RequestMapping(value = "/listMgtDeptStaff", method = RequestMethod.POST)
@ApiOperation(value = "获取部门员工列表")
- public R<List<MgtDeptStaffListVo>> listMgtDeptStaff() {
+ public R<List<MgtDeptStaffListVo>> listMgtDeptStaff(@RequestBody ListMgtDeptStaffDto listMgtDeptStaffDto) {
// 获取当前登陆人的可视权限
- SysUser sysUser = SecurityUtils.getSysUser();
+ SysUser sysUserId = SecurityUtils.getSysUser();
+ SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
// 如果当前登陆人权限是查看部门数据
Long deptId = null;
// 如果当前登陆人是查看个人数据
@@ -77,7 +78,7 @@
}
}
}
- List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId);
+ List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId, listMgtDeptStaffDto.getName());
return R.ok(mgtDeptStaffListVoList);
}
@@ -85,7 +86,7 @@
@RequestMapping(value = "/listDeptStaff", method = RequestMethod.POST)
@ApiOperation(value = "获取所有部门员工列表")
public R<List<MgtDeptStaffListVo>> listDeptStaff() {
- List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(null,null);
+ List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(null,null, null);
return R.ok(mgtDeptStaffListVoList);
}
--
Gitblit v1.7.1