|
@@ -126,9 +126,9 @@ public class SysUserController {
|
|
}
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
|
|
- public Result<Object> getAllUser() {
|
|
|
|
|
|
+ public Result<Object> getAllUser(String status) {
|
|
try {
|
|
try {
|
|
- List<SysUserVo> allUser = sysUserService.getAllUser(null);
|
|
|
|
|
|
+ List<SysUserVo> allUser = sysUserService.getAllUser(null,status);
|
|
return Result.ok(allUser);
|
|
return Result.ok(allUser);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -201,7 +201,7 @@ public class SysUserController {
|
|
String companyId = userCompany.getCompanyId();
|
|
String companyId = userCompany.getCompanyId();
|
|
List<SysUserVo> userList;
|
|
List<SysUserVo> userList;
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
- userList = sysUserService.getAllUser(userName);
|
|
|
|
|
|
+ userList = sysUserService.getAllUser(userName,null);
|
|
} else {
|
|
} else {
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
}
|
|
}
|
|
@@ -234,7 +234,7 @@ public class SysUserController {
|
|
|
|
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
- userList = sysUserService.getAllUser(userName);
|
|
|
|
|
|
+ userList = sysUserService.getAllUser(userName,null);
|
|
} else {
|
|
} else {
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
}
|
|
}
|
|
@@ -263,7 +263,7 @@ public class SysUserController {
|
|
String companyId = userCompany.getCompanyId();
|
|
String companyId = userCompany.getCompanyId();
|
|
List<SysUserVo> userList;
|
|
List<SysUserVo> userList;
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
- userList = sysUserService.getAllUser(userName);
|
|
|
|
|
|
+ userList = sysUserService.getAllUser(userName,null);
|
|
} else {
|
|
} else {
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
userList = sysUserService.getUserListByCompany(companyId, userName);
|
|
}
|
|
}
|