zyp

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -469,10 +469,12 @@ public class FsUserServiceImpl implements IFsUserService
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
 
-        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
-        if (companyUser.isAdmin()){
-            param.setUserId(0L);
-            param.setCompanyId(companyUser.getCompanyId());
+        if (param.getUserId() != null) {
+            CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+            if (companyUser.isAdmin()){
+                param.setUserId(0L);
+                param.setCompanyId(companyUser.getCompanyId());
+            }
         }
         List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);