浏览代码

Merge remote-tracking branch 'origin/master'

zhaoxian 2 年之前
父节点
当前提交
a2eb261d6d

+ 2 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -649,21 +649,9 @@ public class SysUserController {
     public Result<PageInfo<SysUserVo>> getAllList(String userName, int pageNo, int pageSize) {
         Result<PageInfo<SysUserVo>> result = new Result<>();
         try {
-            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
-            userCompanyQueryWrapper.eq("user_id", user.getId());
-            userCompanyQueryWrapper.orderByDesc("create_time");
-            userCompanyQueryWrapper.last("limit 1");
-            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
-            String companyId = userCompany.getCompanyId();
+          //  LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             List<SysUserVo> userList;
-
-            PageHelper.startPage(pageNo, pageSize);
-            if ("1648c7ceb4d449a9a13fbed7a8d9976c".equals(companyId) || "4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId) || "5e46b5dea3d740eeb8ff1a2895015a4b".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName, null);
-            } else {
-                userList = sysUserService.getUserListByCompany(companyId, userName);
-            }
+            userList = sysUserService.getAllUser(userName, null);
             PageInfo<SysUserVo> pageInfo = new PageInfo<>(userList);
             result.setSuccess(true);
             result.setResult(pageInfo);