From 72b6d2ace7b94ac960bceffc014daff9609e8022 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Mon, 5 Jan 2026 21:11:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=85=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E8=BF=87=E6=BB=A4=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/service/impl/ApprovalProcessServiceImpl.java | 5 +++-- .../material/repair/service/impl/RepairServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalProcessServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalProcessServiceImpl.java index 40e6744..2362c22 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalProcessServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalProcessServiceImpl.java @@ -28,8 +28,9 @@ public class ApprovalProcessServiceImpl implements IApprovalProcessService { @Override public List selectProcessList(ApprovalProcess process) { - Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); - process.setDeptId(deptId); + //审批流配置只给管理员开放，暂不过滤组织机构 + //Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + //process.setDeptId(deptId); return processMapper.selectProcessList(process); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 6c5de07..8010716 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -214,7 +214,7 @@ public class RepairServiceImpl implements RepairService { // bean.setCompanyId(deptId); // } if(ADMIN_ID.equals(userId)){ - bean.setCompanyId(1L); + bean.setCompanyId(null); }else{ bean.setCompanyId(deptId); }