From 6c7bf4bf725d4d756a42b8f1be18acb8b53b3b92 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Thu, 15 Jan 2026 13:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=87=8F=E5=85=8D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/common/service/impl/SelectServiceImpl.java    | 7 ++++---
 .../settlement/controller/SltAgreementInfoController.java  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

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();
 
             // ----------- 查询未结算的全部协议 ---------------