From b7179fae41f4bc34e21e9c77b3a787210d15cab6 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 24 Sep 2025 18:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=91=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/SelectServiceImpl.java    |  7 +++++++
 .../mapper/material/common/SelectMapper.xml       | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

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 087dfa1c..6fd1945b 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
@@ -50,6 +50,7 @@ public class SelectServiceImpl implements SelectService {
      */
     @Override
     public AjaxResult getUnitList(BmUnit bmUnit) {
+        Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
         // 性能监控开始
         long startTime = System.currentTimeMillis();
         Map<String, Long> stepTimes = new LinkedHashMap<>();
@@ -72,6 +73,12 @@ public class SelectServiceImpl implements SelectService {
         if (Objects.nonNull(bmUnit) && Objects.nonNull(bmUnit.getEnableFilter()) && bmUnit.getEnableFilter()) {
             bmUnit.setDeptId(thisLoginUserDeptId);
         }
+        if (CollectionUtils.isNotEmpty(userRoles)) {
+            // 技术员只查询项目部类型的单位,固定传值36（项目部类型）
+            if (userRoles.contains("jsy")) {
+                bmUnit.setTypeId(36L);
+            }
+        }
         stepTimes.put("过滤判断", System.currentTimeMillis() - step2Start);
 
         // 步骤3: 判断是否是app模式
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index 51296c72..6a5c74f5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="unitId != null">
             AND bu.unit_id = #{unitId}
         </if>
+        <if test="typeId != null and typeId != 0">
+            AND bu.type_id = #{typeId}
+        </if>
 
         UNION
 
@@ -65,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="unitId != null">
             AND bu.unit_id = #{unitId}
         </if>
+        <if test="typeId != null and typeId != 0">
+            AND bu.type_id = #{typeId}
+        </if>
 
         UNION
         SELECT
@@ -93,6 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="unitId != null">
             AND bu.unit_id = #{unitId}
         </if>
+        <if test="typeId != null and typeId != 0">
+            AND bu.type_id = #{typeId}
+        </if>
         ) ff
         ORDER BY
         LEVEL
@@ -382,6 +391,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null and deptId != 0">
                 AND bpl.imp_unit = #{deptId}
             </if>
+            <if test="typeId != null and typeId != 0">
+                AND bu.type_id = #{typeId}
+            </if>
         </if>
         <if test="projectId == null">
             SELECT unit_id AS unitId,
@@ -391,6 +403,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null and deptId != 0">
                 AND dept_id = #{deptId}
             </if>
+            <if test="typeId != null and typeId != 0">
+                AND bu.type_id = #{typeId}
+            </if>
         </if>
     </select>