diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index a3e821fc..13805c25 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -74,9 +74,10 @@ public class SelectServiceImpl implements SelectService { // } if (CollectionUtils.isNotEmpty(userRoles)) { // 技术员只查询项目部类型的单位,固定传值36(项目部类型) - if (userRoles.contains("jsy")) { - bmUnit.setTypeId(36L); - } + // 暂时取消项目部限制 2026-01-14 syruan +// if (userRoles.contains("jsy")) { +// bmUnit.setTypeId(36L); +// } } stepTimes.put("过滤判断", System.currentTimeMillis() - step2Start); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java index 8352e7cd..05b34bd6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java @@ -1751,6 +1751,8 @@ public class SltAgreementInfoController extends BaseController { if (query == null) { query = new SltAgreementInfo(); } + Long deptId = typeService.getUserDeptId(); + query.setCompanyId(deptId); startPage(); // ----------- 查询未结算的全部协议 ---------------