[fix]

基础资料
修改请购单、员工领料单、出差单、报销单查询分页列表service方法，添加查看所有信息角色权限判断；
修改报销单查询角色可看用户service方法，修改人事经理、品质经理权限；

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java

@@ -2,10 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.github.pagehelper.Page;
@@ -23,6 +20,7 @@ import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
 import com.ruoyi.system.domain.BaseEmpRequisiteOrderChild;
 import com.ruoyi.system.domain.BaseRequisitioningOrderChild;
 import com.ruoyi.system.domain.Vo.BaseEmpRequisiteOrderVO;
+import com.ruoyi.system.domain.Vo.BaseEvectionFormVo;
 import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo;
 import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
 import com.ruoyi.system.mapper.BaseEmpRequisiteOrderChildMapper;
@@ -113,12 +111,18 @@ public class BaseEmpRequisiteOrderServiceImpl implements IBaseEmpRequisiteOrderS
         Set<String> roleKeys = roleService.selectRoleKeys(userId);
         List<BaseEmpRequisiteOrderVO> Volist = baseEmpRequisiteOrderMapper.selectBaseEmpRequisiteOrderList(baseEmpRequisiteOrderVO);
 
+        List<BaseEmpRequisiteOrderVO> matchedList = new ArrayList<>();
+        if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole")
+                || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")){
+            matchedList = Volist;
+        }else{
             //        获取当前登录名下可看用户列表
             Set<String> users = baseExpenseAccountService.userLimitedList(roleKeys,curUser);
 
-        List<BaseEmpRequisiteOrderVO> matchedList = Volist.stream()
+            matchedList = Volist.stream()
                     .filter(empRequisiteOrderVO -> users.contains(empRequisiteOrderVO.getApplyUser()))
                     .collect(Collectors.toList());
+        }
 
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java

@@ -1,9 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.github.pagehelper.Page;
@@ -96,19 +93,28 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService
         Long userId = curUser.getUserId();
         Set<String> roleKeys = roleService.selectRoleKeys(userId);
         List<BaseEvectionFormVo> Volist = baseEvectionFormMapper.selectBaseEvectionFormList(baseEvectionForm);
+        List<BaseEvectionFormVo> matchedList = new ArrayList<>();
+        if(roleKeys.contains("hrzyRole")||roleKeys.contains("hrjlRole")
+                ||roleKeys.contains("hrzgRole")||roleKeys.contains("zjlRole")
+                || roleKeys.contains("zozjRole") || roleKeys.contains("fzjlRole")
+                || roleKeys.contains("admin")){
+             matchedList = Volist;
+        }else{
             //        获取当前登录名下可看用户列表
             Set<String> users = expenseAccountService.userLimitedList(roleKeys,curUser);
 
-        List<BaseEvectionFormVo> matchedList = Volist.stream()
+             matchedList = Volist.stream()
                     .filter(expenseAccount -> users.contains(expenseAccount.getApplyUser()))
                     .collect(Collectors.toList());
+        }
 
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
         PageHelper.startPage(pageNum, pageSize);
         //PageHelper 仅对第一List分页有效
-        PageInfo<BaseEvectionFormVo> pageInfo = new PageInfo<>(matchedList);
+        PageInfo<BaseEvectionFormVo> pageInfo = new PageInfo<>(
+                matchedList);
         List<BaseEvectionFormVo> list = pageInfo.getList();
         Page<BaseEvectionFormVo>  returnList = new Page<>();
         for(BaseEvectionFormVo baseEvectionFormVo : list){

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.process.general.service.IProcessService;
 import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
 import com.ruoyi.system.domain.BaseExpenseAccountChild;
+import com.ruoyi.system.domain.Vo.BaseEmpRequisiteOrderVO;
 import com.ruoyi.system.domain.Vo.BaseExpenseAccountVo;
 import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo;
 import com.ruoyi.system.mapper.SysDeptMapper;
@@ -108,12 +109,18 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService
         Set<String> roleKeys = roleService.selectRoleKeys(userId);
         List<BaseExpenseAccountVo> Volist = baseExpenseAccountMapper.selectBaseExpenseAccountList(baseExpenseAccount);
 
+        List<BaseExpenseAccountVo> matchedList = new ArrayList<>();
+        if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole")
+                || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")|| roleKeys.contains("cwshRole")){
+            matchedList = Volist;
+        }else{
             //        获取当前登录名下可看用户列表
             Set<String> users = userLimitedList(roleKeys,curUser);
 
-        List<BaseExpenseAccountVo> matchedList = Volist.stream()
+            matchedList = Volist.stream()
                     .filter(expenseAccount -> users.contains(expenseAccount.getApplyUser()))
                     .collect(Collectors.toList());
+        }
 
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -530,14 +537,15 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService
 
         if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole")
                 || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")
-                || roleKeys.contains("cwshRole")|| roleKeys.contains("hrjlRole")){
+                || roleKeys.contains("cwshRole")){
             Set<String> users = sysUserlist.stream()
                     .map(SysUser::getLoginName) // 提取每个 SysUser 对象的 name 属性
                     .collect(Collectors.toSet());
             return users;
         }else if(roleKeys.contains("gcjlRole") || roleKeys.contains("scjlRole") || roleKeys.contains("cgjlRole")
                 || roleKeys.contains("ywjlRole")|| roleKeys.contains("wwjlRole")|| roleKeys.contains("shjlRole")
-                || roleKeys.contains("ckjlRole")|| roleKeys.contains("yfzjRole")|| roleKeys.contains("cwjlRole")) {
+                || roleKeys.contains("ckjlRole")|| roleKeys.contains("yfzjRole")|| roleKeys.contains("cwjlRole")
+                || roleKeys.contains("pzjlRole")|| roleKeys.contains("hrjlRole")) {
             // 部门经理查询部门所属下的所有
             // 去除列表中部门id为空的数据
             sysUserlist = sysUserlist.stream().filter(item->(item.getDeptId()!=null)).collect(Collectors.toList());

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java

@@ -26,6 +26,7 @@ import com.ruoyi.purchase.mapper.PurchasePlanChildMapper;
 import com.ruoyi.purchase.mapper.PurchasePlanMapper;
 import com.ruoyi.purchase.service.IPurchasePlanService;
 import com.ruoyi.system.domain.BaseRequisitioningOrderChild;
+import com.ruoyi.system.domain.Vo.BaseExpenseAccountVo;
 import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo;
 import com.ruoyi.system.mapper.BaseRequisitioningOrderChildMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
@@ -129,12 +130,18 @@ public class BaseRequisitioningOrderServiceImpl implements IBaseRequisitioningOr
         Set<String> roleKeys = roleService.selectRoleKeys(userId);
         List<BaseRequisitioningOrderVo> Volist = baseRequisitioningOrderMapper.selectBaseRequisitioningOrderList(baseRequisitioningOrderVo1);
 
+        List<BaseRequisitioningOrderVo> matchedList = new ArrayList<>();
+        if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole")
+                || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")){
+            matchedList = Volist;
+        }else{
 //            获取当前登录名下可看用户列表
             Set<String> users = baseExpenseAccountService.userLimitedList(roleKeys,curUser);
 
-        List<BaseRequisitioningOrderVo> matchedList = Volist.stream()
+            matchedList = Volist.stream()
                     .filter(requisitioningOrderVo -> users.contains(requisitioningOrderVo.getApplyUser()))
                     .collect(Collectors.toList());
+        }
 
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();