From 32b1dc49323ddc89967374031d154d1cf426023f Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 27 Feb 2024 14:07:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BackApplyServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 5c4e5170..75f2ddae 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -52,6 +52,7 @@ public class BackApplyServiceImpl implements BackApplyService { @Override public List getBackAuditList(BackApplyInfo bean) { Set roles = SecurityUtils.getLoginUser().getRoles(); + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); if (roles.contains("admin")) { //管理员可以看到所有退料申请 return backApplyMapper.getBackApplyListByAdmin(bean); @@ -59,18 +60,22 @@ public class BackApplyServiceImpl implements BackApplyService { List backApplyInfos = new ArrayList<>(); List backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean); //机具分公司只能看到机具公司的退料 - if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("sgb")) { - for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { - if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("101")) { - backApplyInfos.add(backApplyInfo); + if (CollUtil.isNotEmpty(backApplyListByAdmin)) { + if (roles.contains("sgb") || roles.contains("jjfgs")) { + for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { + if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) { + backApplyInfos.add(backApplyInfo); + } } } } //调试分公司只能看到调试公司的退料 - if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("ajb")) { - for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { - if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("102")) { - backApplyInfos.add(backApplyInfo); + if (CollUtil.isNotEmpty(backApplyListByAdmin)) { + if (roles.contains("ajb") || roles.contains("tsfgs")) { + for (BackApplyInfo backApplyInfo : backApplyListByAdmin) { + if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) { + backApplyInfos.add(backApplyInfo); + } } } }