From 4bc97b87ac29d9485094a3ff80bd5789e2ede6d8 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 13 Sep 2025 01:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/constant/MaterialConstants.java       |  3 +++
 .../impl/MaterialMachineServiceImpl.java      | 27 +++++++++++--------
 .../material/clz/MaterialMachineMapper.xml    | 15 +++++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
index 9d51cfa7..235aa0ab 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
@@ -73,6 +73,9 @@ public class MaterialConstants {
     /** 材料站退料单号的开头字母 */
     public static final String BACK_MATERIAL_TASK_TYPE_LABEL = "MT";
 
+    /** 材料站预约退料单号的开头字母 */
+    public static final String BACK_MATERIAL_APPOINT_TASK_TYPE_LABEL = "YT";
+
     /** 维修单号的开头字母 */
     public static final String REPAIR_TASK_TYPE_LABEL = "WX";
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
index 51720b2d..ec7e7c69 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
@@ -145,18 +145,23 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
         String username = SecurityUtils.getLoginUser().getUsername();
         // 根据用户名判断用户是否为班组长
         BmTeam teamData = materialMachineMapper.getTeamData(username);
-        if (teamData == null) {
-            // 根据用户名查询项目部信息
-            List<String> departId = mapper.getDepartId(username);
-            // 根据项目部id查询工程信息
-            List<String> projectIdList = mapper.getProjectId(departId);
-            if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) {
-                bean.setProjectIdList(projectIdList);
+        Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
+        // 检查用户是否具有特殊角色
+        boolean hasSpecialRole = hasSpecialRole(userRoles);
+        if (!hasSpecialRole) {
+            if (teamData == null) {
+                // 根据用户名查询项目部信息
+                List<String> departId = mapper.getDepartId(username);
+                // 根据项目部id查询工程信息
+                List<String> projectIdList = mapper.getProjectId(departId);
+                if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) {
+                    bean.setProjectIdList(projectIdList);
+                }
+            }
+            Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+            if (deptId != null) {
+                bean.setImpUnit(deptId.toString());
             }
-        }
-        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-        if (deptId != null) {
-            bean.setImpUnit(deptId.toString());
         }
         // 查询目前在用的设备信息
         List<MaterialRetainedEquipmentInfo> usList = materialMachineMapper.getUsInfoList(bean);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index 51753e5c..c4f6be01 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -1022,6 +1022,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="departName != null and departName != ''">
             AND bp.pro_center = #{departName}
         </if>
+        <if test="impUnit != null and impUnit != ''">
+            and bp.imp_unit = #{impUnit}
+        </if>
+        <if test="projectIdList != null  and projectIdList.size() > 0">
+            and bp.external_id  in
+            <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectTeamNum" resultType="java.lang.Integer">
@@ -1038,6 +1047,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="proName != null and proName != ''">
             AND bz.project_name = #{proName}
         </if>
+        <if test="projectIdList != null  and projectIdList.size() > 0">
+            and bz.project_id  in
+            <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="teamName != null and teamName != ''">
             AND bz.bzmc = #{teamName}
         </if>