From 0bb1374529e69ee2153e27eb26cdf91c60ec0279 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 20 Feb 2025 09:17:21 +0800
Subject: [PATCH] =?UTF-8?q?2025-02-20=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/change/mapper/ChangeManagementMapper.java       | 2 +-
 .../change/service/impl/ChangeManagementServiceImpl.java    | 6 +++---
 src/main/resources/mapper/change/ChangeManagementMapper.xml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index 2886f709..bf7de21a 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -125,7 +125,7 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
 
     void updateStepId(ChangeRequestVo data);
 
-    int getStepId(@Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId);
+    int getStepId(@Param("classificationNo") String classificationNo, @Param("nodeId") String nodeId, @Param("site") String site);
 
     void updateChangeReject(ChangeRequestVo data);
 
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 15e58feb..4295e411 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1177,7 +1177,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         Map<String, String> dcas = new HashMap<>();
 
         // 新增PLM流程单据表信息
-        int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")));
+        int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")), paramData.getSite()); // 2025-02-20 海波要求加site
         paramData.setStepId(stepId);
         for (Map<String, Object> remark : isRemarks) {
             // 根据 userId 调用获取人员信息接口获得域控账号
@@ -1570,7 +1570,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
             // 存放isRemark为0的域控账号
             Map<String, String> dcas = new HashMap<>();
-            int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")));
+            int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")), paramData.getSite());
             paramData.setStepId(stepId);
             for (Map<String, Object> isRemark : isRemarks) { // isRemark = 0
                 ProcessFormEntity processFormEntity = new ProcessFormEntity();
@@ -1719,7 +1719,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         } else { // 未结束
             // 存放isRemark为0的域控账号
             Map<String, String> dcas = new HashMap<>();
-            int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")));
+            int stepId = changeManagementMapper.getStepId(paramData.getClassificationNo(), String.valueOf(isRemarks.get(0).get("nodeid")), paramData.getSite());
             paramData.setStepId(stepId);
             for (Map<String, Object> isRemark : isRemarks) {
                 // 根据 userId 调用获取人员信息接口获得域控账号
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 35b56bf5..c50233e3 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -905,7 +905,7 @@
     <select id="getStepId" parameterType="string" resultType="int">
         SELECT step_id
         FROM plm_request_node
-        WHERE classification_no = #{classificationNo} and node_id = #{nodeId}
+        WHERE classification_no = #{classificationNo} and node_id = #{nodeId} and site = #{site}
     </select>
 
     <!-- 编辑变更单的驳回标识 -->