From 9e888f335f1141239cb53213aadb2b884b054caa Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 27 Feb 2026 15:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A5=E6=9C=89"=E5=B7=A5=E7=A8=8B=E5=AE=9E?=
 =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=E5=91=98"?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/erf/data/ErfExpApplyData.java   |  5 +++++
 .../service/impl/ErfExpApplyServiceImpl.java    | 17 +++++++++++++----
 .../resources/mapper/erf/ErfExpApplyMapper.xml  |  7 +++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java
index d93d1418..5626c6f2 100644
--- a/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java
+++ b/src/main/java/com/xujie/sys/modules/erf/data/ErfExpApplyData.java
@@ -262,6 +262,11 @@ public class ErfExpApplyData implements Serializable {
 
     private String pendingStatus;
 
+    /**
+     * 是否为工程实验申请管理员（true=管理员可查看所有待办）
+     */
+    private Boolean isAdmin;
+
     /**
      * 下达时间
      */
diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index d57db58d..a8dac5a8 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -434,6 +434,15 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
     @Override
     public PageUtils getPendingApplyList(ErfExpApplyData data) {
+        // 检查当前用户是否拥有"工程实验申请管理员"角色，若是则可查看所有待办
+        if (data.getCurrentUserId() != null) {
+            List<UserRoleDto> adminRoles = sysUserDao.getUserRolesByRoleNames(
+                    data.getCurrentUserId(), List.of("工程实验申请管理员"));
+            if (!adminRoles.isEmpty()) {
+                data.setIsAdmin(true);
+            }
+        }
+
         PageHelper.startPage(data.getPage(), data.getLimit());
         List<ErfExpApplyData> list = erfExpApplyMapper.getPendingApplyList(data);
         PageInfo<ErfExpApplyData> pageInfo = new PageInfo<>(list);
@@ -960,7 +969,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
     /**
      * 根据用户角色获取对应的技术经理
-     * 
+     *
      * @param userId 用户ID
      * @param buNo 事业部编码
      * @return 技术经理信息
@@ -989,7 +998,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
         // 3. 查询对应的技术经理用户ID（根据BU过滤，查不到直接返回null）
         ManagerInfoDto manager = sysUserDao.getFirstManagerByRoleNameAndBu(managerRoleName, buNo);
-        
+
         if (manager == null) {
             throw new XJException(String.format("BU %s 中找不到【%s】角色的用户，请联系管理员配置", buNo, managerRoleName));
         }
@@ -1005,7 +1014,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
     /**
      * 根据BU获取生产经理列表
-     * 
+     *
      * @param buNo 事业部编码
      * @return 生产经理列表（查不到返回空列表）
      */
@@ -1028,7 +1037,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
     /**
      * 根据BU获取质量经理列表
-     * 
+     *
      * @param buNo 事业部编码
      * @return 质量经理列表（查不到返回空列表）
      */
diff --git a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
index 7c782e2c..6cb091a1 100644
--- a/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
+++ b/src/main/resources/mapper/erf/ErfExpApplyMapper.xml
@@ -187,8 +187,11 @@
         FROM erf_exp_apply a
         INNER JOIN erf_flow_node_instance n ON a.apply_no = n.apply_no
         <where>
-            n.assignee_user_id = #{data.currentUserId}
-            AND n.status = '待审核'
+            <if test="data.isAdmin == null or !data.isAdmin">
+                n.assignee_user_id = #{data.currentUserId}
+                AND
+            </if>
+            n.status = '待审核'
             <!-- 根据不同页面类型，过滤不同的节点类型 -->
             <if test="data.pageType != null and data.pageType == 'MANAGER'">
                 AND n.node_code IN ('技术经理审批', '生产经理审批', '质量经理审批')