From 3937251313e2cb2c1b40df10d45b0624bfe45253 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Wed, 18 Mar 2026 18:42:59 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=BE=85=E5=8A=9E=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sdm/project/model/req/SpdmTaskListReq.java    | 5 +++++
 .../sdm/project/service/impl/LyricInternalServiceImpl.java | 7 ++++---
 .../java/com/sdm/project/service/impl/NodeServiceImpl.java | 7 ++++---
 project/src/main/resources/mapper/SimulationTaskMapper.xml | 3 +++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
index a1ebe35b..80fccd32 100644
--- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
@@ -168,4 +168,9 @@ public class SpdmTaskListReq {
      */
     private String submitterName;
 
+    /**
+     * 利元亨定制，支持查询主题名（需求名）
+     */
+    private String tag10;
+
 }
diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
index 3ca76912..012bbf4c 100644
--- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
@@ -883,11 +883,12 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
             Map<String, List<UpdatePermissionReq>> permissionMap = updatePermissionList.stream().collect(Collectors.groupingBy(UpdatePermissionReq::getUuid));
             for (Map.Entry<String, List<UpdatePermissionReq>> permissionEntry : permissionMap.entrySet()) {
                 BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
-                Map<Long, Byte> userPermissions = new HashMap<>();
                 String uuid = permissionEntry.getKey();
+                Map<Long, Byte> userPermissions = new HashMap<>();
                 item.setUuid(uuid);
-                for (UpdatePermissionReq updatePermissionReq : permissionEntry.getValue()) {
-                    userPermissions.put(updatePermissionReq.getUserId(), updatePermissionReq.getPermission());
+                List<UpdatePermissionReq> updatePermissionReqList = permissionEntry.getValue();
+                for (UpdatePermissionReq updatePermissionReq : updatePermissionReqList) {
+                    userPermissions.putAll(updatePermissionReq.getUserPermissions());
                 }
                 item.setUserPermissions(userPermissions);
                 filePermissions.add(item);
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index 949d04bc..fbc492f6 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -4072,11 +4072,12 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
             Map<String, List<UpdatePermissionReq>> permissionMap = permissionReqList.stream().collect(Collectors.groupingBy(UpdatePermissionReq::getUuid));
             for (Map.Entry<String, List<UpdatePermissionReq>> permissionEntry : permissionMap.entrySet()) {
                 BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
-                Map<Long, Byte> userPermissions = new HashMap<>();
                 String uuid = permissionEntry.getKey();
+                Map<Long, Byte> userPermissions = new HashMap<>();
                 item.setUuid(uuid);
-                for (UpdatePermissionReq updatePermissionReq : permissionEntry.getValue()) {
-                    userPermissions.put(updatePermissionReq.getUserId(), updatePermissionReq.getPermission());
+                List<UpdatePermissionReq> updatePermissionReqList = permissionEntry.getValue();
+                for (UpdatePermissionReq updatePermissionReq : updatePermissionReqList) {
+                    userPermissions.putAll(updatePermissionReq.getUserPermissions());
                 }
                 item.setUserPermissions(userPermissions);
                 filePermissions.add(item);
diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml
index 42925aef..573545bd 100644
--- a/project/src/main/resources/mapper/SimulationTaskMapper.xml
+++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml
@@ -780,6 +780,9 @@
         <if test="req.expStatusValue != null and req.expStatusValue != ''">
             and expStatus = #{req.expStatusValue}
         </if>
+        <if test="req.tag10 != null and req.tag10 != ''">
+            and tag10 = #{req.tag10}
+        </if>
         <if test="(req.exeStatusList != null and req.exeStatusList.size > 0) or (req.todayTmrTasks != null and req.todayTmrTasks != '')">
             and (
             <choose>