|
@@ -112,7 +112,7 @@ public class SysUserController {
|
|
|
public Result<List<SysUserVo>> getAllUserListByCompany(String userId) {
|
|
|
Result<List<SysUserVo>> result = new Result<>();
|
|
|
try {
|
|
|
- List<SysUserVo> userList = new ArrayList<>();
|
|
|
+ /*List<SysUserVo> userList = new ArrayList<>();
|
|
|
String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
|
|
|
if (!"admin".equals(roleCode)) {
|
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
@@ -124,7 +124,8 @@ public class SysUserController {
|
|
|
} else {
|
|
|
userList = sysUserService.getAllUser();
|
|
|
}
|
|
|
-
|
|
|
+*/
|
|
|
+ List<SysUserVo> userList = sysUserService.getAllUser();
|
|
|
result.setSuccess(true);
|
|
|
result.setResult(userList);
|
|
|
} catch (Exception e) {
|