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); }