处理admin小黑屋查询报错问题

fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.utils.ParseUtils;
@@ -198,13 +199,16 @@ public class FsUserController extends BaseController
 //        startPage();
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
-        for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOPageInfo.getList()) {
-            fsUserPageListVO.setPhone(ParseUtils.parsePhone(fsUserPageListVO.getPhone()));
+        if(ObjectUtils.isNotNull(fsUserPageListVOPageInfo)){
+            for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOPageInfo.getList()) {
+                fsUserPageListVO.setPhone(ParseUtils.parsePhone(fsUserPageListVO.getPhone()));
+            }
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("rows", fsUserPageListVOPageInfo.getList());
+            map.put("total", fsUserPageListVOPageInfo.getList().size());
+            return R.ok(map);
         }
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("rows", fsUserPageListVOPageInfo.getList());
-        map.put("total", fsUserPageListVOPageInfo.getList().size());
-        return R.ok(map);
+        return R.ok();
     }
 
     @PreAuthorize("@ss.hasPermi('his:user:enabledUsers')")

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -527,35 +527,40 @@ public class FsUserServiceImpl implements IFsUserService
 //            companyUsers = new ArrayList<>();
 //        }
 
-        if (companyUser.isAdmin()){
-            param.setUserId(0L);
-            param.setCompanyId(companyUser.getCompanyId());
-        }
+        if(ObjectUtils.isNotNull(companyUser)){
+            if (companyUser.isAdmin()){
+                param.setUserId(0L);
+                param.setCompanyId(companyUser.getCompanyId());
+            }
 
-        List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
-        // 获取当前销售所有重粉会员
-        List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(companyUser.getUserId());
+            List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
+            // 获取当前销售所有重粉会员
+            List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(companyUser.getUserId());
 
-        if(!fsUserCompanyUsers.isEmpty()){
-            List<Long> userIds = fsUserCompanyUsers.stream().map(FsUserCompanyUser::getUserId).collect(Collectors.toList());
-            // 获取会员所属的重粉销售
-            List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
-            Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
+            if(!fsUserCompanyUsers.isEmpty()){
+                List<Long> userIds = fsUserCompanyUsers.stream().map(FsUserCompanyUser::getUserId).collect(Collectors.toList());
+                // 获取会员所属的重粉销售
+                List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
+                Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
 
-            for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
-                fsUserPageListVO.setRepeatCompanyUserName(map.get(fsUserPageListVO.getUserId()));
-                if ("微信用户".equals(fsUserPageListVO.getNickname()) && StringUtils.isNotEmpty(fsUserPageListVO.getPhone())) {
-                    fsUserPageListVO.setNickname(fsUserPageListVO.getPhone());
-                }
-                if(StringUtils.isNotEmpty(fsUserPageListVO.getTag()) && fsUserPageListVO.getIsRepeatFans() == 0){
-                    StringBuilder newTag = removeRepeatFansTag(fsUserPageListVO);
-                    fsUserPageListVO.setTag(newTag.toString());
+                for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
+                    fsUserPageListVO.setRepeatCompanyUserName(map.get(fsUserPageListVO.getUserId()));
+                    if ("微信用户".equals(fsUserPageListVO.getNickname()) && StringUtils.isNotEmpty(fsUserPageListVO.getPhone())) {
+                        fsUserPageListVO.setNickname(fsUserPageListVO.getPhone());
+                    }
+                    if(StringUtils.isNotEmpty(fsUserPageListVO.getTag()) && fsUserPageListVO.getIsRepeatFans() == 0){
+                        StringBuilder newTag = removeRepeatFansTag(fsUserPageListVO);
+                        fsUserPageListVO.setTag(newTag.toString());
+                    }
                 }
+                return new PageInfo<>(fsUserPageListVOS);
+            } else {
+                return new PageInfo<>(fsUserPageListVOS);
             }
-            return new PageInfo<>(fsUserPageListVOS);
-        } else {
-            return new PageInfo<>(fsUserPageListVOS);
+        }else {
+            return null;
         }
+
     }
 
     private static StringBuilder removeRepeatFansTag(FsUserPageListVO fsUserPageListVO) {