1

src/main/java/com/fdkankan/manage_jp/service/impl/UserServiceImpl.java

@@ -163,7 +163,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     public Object pageList(UserListParam param,User user) {
 
         Set<Long> roleIds = userRoleService.getByUser(user);
-        if(roleIds.contains(6L)){
+        if(!roleIds.contains(1L) && !roleIds.contains(5L)){
             param.setCompanyId(user.getCompanyId());
         }
         Page<UserExcelVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()),param);