From 03e094816c301ebcab47d1c0de35e1d71bc8f091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 5 Dec 2024 11:06:35 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E8=B4=AD=E5=8D=95=E3=80=81=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E9=A2=86=E6=96=99=E5=8D=95=E3=80=81=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E5=8D=95=E3=80=81=E6=8A=A5=E9=94=80=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8service=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=80?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2=E5=8F=AF=E7=9C=8B?= =?UTF-8?q?=E7=94=A8=E6=88=B7service=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=E4=BA=8B=E7=BB=8F=E7=90=86=E3=80=81=E5=93=81?= =?UTF-8?q?=E8=B4=A8=E7=BB=8F=E7=90=86=E6=9D=83=E9=99=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseEmpRequisiteOrderServiceImpl.java | 22 +++++++++------- .../impl/BaseEvectionFormServiceImpl.java | 26 ++++++++++++------- .../impl/BaseExpenseAccountServiceImpl.java | 22 +++++++++++----- .../BaseRequisitioningOrderServiceImpl.java | 19 +++++++++----- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java index 038f2276..f1fad461 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEmpRequisiteOrderServiceImpl.java +++ b/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.List; -import java.util.Map; -import java.util.Set; +import java.util.*; 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 roleKeys = roleService.selectRoleKeys(userId); List Volist = baseEmpRequisiteOrderMapper.selectBaseEmpRequisiteOrderList(baseEmpRequisiteOrderVO); - // 获取当前登录名下可看用户列表 - Set users = baseExpenseAccountService.userLimitedList(roleKeys,curUser); + List matchedList = new ArrayList<>(); + if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") + || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")){ + matchedList = Volist; + }else{ + // 获取当前登录名下可看用户列表 + Set users = baseExpenseAccountService.userLimitedList(roleKeys,curUser); - List matchedList = Volist.stream() - .filter(empRequisiteOrderVO -> users.contains(empRequisiteOrderVO.getApplyUser())) - .collect(Collectors.toList()); + matchedList = Volist.stream() + .filter(empRequisiteOrderVO -> users.contains(empRequisiteOrderVO.getApplyUser())) + .collect(Collectors.toList()); + } PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java index ede4a013..c7a6d687 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java +++ b/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.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import com.github.pagehelper.Page; @@ -96,19 +93,28 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService Long userId = curUser.getUserId(); Set roleKeys = roleService.selectRoleKeys(userId); List Volist = baseEvectionFormMapper.selectBaseEvectionFormList(baseEvectionForm); -// 获取当前登录名下可看用户列表 - Set users = expenseAccountService.userLimitedList(roleKeys,curUser); + List 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 users = expenseAccountService.userLimitedList(roleKeys,curUser); - List matchedList = Volist.stream() - .filter(expenseAccount -> users.contains(expenseAccount.getApplyUser())) - .collect(Collectors.toList()); + 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 pageInfo = new PageInfo<>(matchedList); + PageInfo pageInfo = new PageInfo<>( + matchedList); List list = pageInfo.getList(); Page returnList = new Page<>(); for(BaseEvectionFormVo baseEvectionFormVo : list){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index edd3a5ca..9abe7eff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/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 roleKeys = roleService.selectRoleKeys(userId); List Volist = baseExpenseAccountMapper.selectBaseExpenseAccountList(baseExpenseAccount); -// 获取当前登录名下可看用户列表 - Set users = userLimitedList(roleKeys,curUser); + List matchedList = new ArrayList<>(); + if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") + || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")|| roleKeys.contains("cwshRole")){ + matchedList = Volist; + }else{ + // 获取当前登录名下可看用户列表 + Set users = userLimitedList(roleKeys,curUser); - List matchedList = Volist.stream() - .filter(expenseAccount -> users.contains(expenseAccount.getApplyUser())) - .collect(Collectors.toList()); + 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 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()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java index 57540090..44b966b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseRequisitioningOrderServiceImpl.java +++ b/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 roleKeys = roleService.selectRoleKeys(userId); List Volist = baseRequisitioningOrderMapper.selectBaseRequisitioningOrderList(baseRequisitioningOrderVo1); -// 获取当前登录名下可看用户列表 - Set users = baseExpenseAccountService.userLimitedList(roleKeys,curUser); - - List matchedList = Volist.stream() - .filter(requisitioningOrderVo -> users.contains(requisitioningOrderVo.getApplyUser())) - .collect(Collectors.toList()); + List matchedList = new ArrayList<>(); + if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") + || roleKeys.contains("fzjlRole") || roleKeys.contains("admin")){ + matchedList = Volist; + }else{ +// 获取当前登录名下可看用户列表 + Set users = baseExpenseAccountService.userLimitedList(roleKeys,curUser); + + matchedList = Volist.stream() + .filter(requisitioningOrderVo -> users.contains(requisitioningOrderVo.getApplyUser())) + .collect(Collectors.toList()); + } PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum();