yumeng 1 éve
szülő
commit
17f462ac33

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

@@ -154,7 +154,7 @@ public class SysUserController {
                 if (oConvertUtils.isNotEmpty(id)) {
                     SysUser sysUser = new SysUser();
                     sysUser.setStatus(Integer.parseInt(status));
-                    if("2".equals(status)){
+                    if ("2".equals(status)) {
                         sysUser.setFrozenTime(DateUtils.formatDate(new Date()));
                     }
                     this.sysUserService.update(sysUser,
@@ -649,7 +649,7 @@ 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();
+            //  LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             List<SysUserVo> userList;
             userList = sysUserService.getAllUser(userName, null);
             PageInfo<SysUserVo> pageInfo = new PageInfo<>(userList);
@@ -1264,21 +1264,21 @@ public class SysUserController {
     public Result<List<SysUserVo>> getAllUserListByCompany(String userName) {
         Result<List<SysUserVo>> result = new Result<>();
         try {
-            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+         /*   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();
-            List<SysUserVo> userList;
+            List<SysUserVo> userList  = sysUserService.getAllUser(userName, null);
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId) || "5e46b5dea3d740eeb8ff1a2895015a4b".equals(companyId) || "3321d5893bcd430cab1238a99bc7db11".equals(companyId)) {
                 userList = sysUserService.getAllUser(userName, null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
-            }
-
-
+                userList = sysUserService.getAllUser(userName, null);
+            }*/
+            List<SysUserVo> userList = sysUserService.getAllUser(userName, null);
             result.setSuccess(true);
             result.setResult(userList);
         } catch (Exception e) {