zyp

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

@@ -509,7 +509,7 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
-          CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+
 
 //        List<CompanyRole> companyRoles = companyRoleMapper.selectRolePermissionByUserId(param.getUserId());
 //        List<CompanyUser> companyUsers;
@@ -527,40 +527,40 @@ public class FsUserServiceImpl implements IFsUserService
 //            companyUsers = new ArrayList<>();
 //        }
 
-        if(ObjectUtils.isNotNull(companyUser)){
-            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);
-            // 获取当前销售所有重粉会员
-            List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(companyUser.getUserId());
+        List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
+        // 获取当前销售所有重粉会员
+        List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(param.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);
             }
-        }else {
-            return null;
+            return new PageInfo<>(fsUserPageListVOS);
+        } else {
+            return new PageInfo<>(fsUserPageListVOS);
         }
 
+
     }
 
     private static StringBuilder removeRepeatFansTag(FsUserPageListVO fsUserPageListVO) {