|
@@ -131,15 +131,14 @@ public class SysUserController extends AbstractController {
|
|
|
public Result staffList(String staffName,
|
|
|
@RequestParam(name = "pageNum") long pageNum,
|
|
|
@RequestParam(name = "pageSize") long pageSize,
|
|
|
- @RequestParam(name = "deptName",required = false) String deptName,
|
|
|
- @RequestParam(name = "deptId") long deptId) {
|
|
|
+ @RequestParam(name = "deptName",required = false) String deptName) {
|
|
|
|
|
|
IPage<SysUserEntity> resultPage = null;
|
|
|
|
|
|
if (getUserId() != Constant.SUPER_ADMIN) {
|
|
|
//非系统管理员,需要踢掉超级管理员
|
|
|
resultPage = sysUserService.getCompanyStaffList(staffName, deptName,
|
|
|
- pageNum, pageSize , deptId , true);
|
|
|
+ pageNum, pageSize , getDeptId() , true);
|
|
|
}else{
|
|
|
//只有超级管理员才有权限查看自己的数据
|
|
|
resultPage = sysUserService.getCompanyStaffList(staffName, deptName,
|