From 3ef270bb02248160a49a505a467008eaae202313 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Mon, 15 Jun 2026 15:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...msIssueTicketProcessControllerService.java | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
index 26e41218..0ae19518 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
@@ -301,18 +301,6 @@ public class QmsIssueTicketProcessControllerService {
 
         Long processId = process.getId();
 
-        // 3. 保存数据：前端传入approvalStatus/approvalOpinion，数据库填入leaderApprovalResult/leaderApprovalOpinion
-        issueTicketProcessService.lambdaUpdate()
-                .eq(QmsIssueTicketProcess::getId, processId)
-                .set(request.getApprovalOpinion() != null,
-                        QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion())
-                .set(request.getApprovalStatus() != null,
-                        QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus())
-                .set(QmsIssueTicketProcess::getLeaderUserId, currentUserId)
-                .set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName())
-                .set(QmsIssueTicketProcess::getLeaderApprovalTime, now)
-                .update();
-
         issueTicketToDoService.processed(ticket.getId());
 
         Short leaderApprovalResult = request.getApprovalStatus();
@@ -371,6 +359,17 @@ public class QmsIssueTicketProcessControllerService {
                 issueTicketToDoService.save(todoItem);
             }
         } else if (leaderApprovalResult == 0) {
+            // 同意：保存领导审批结果
+            issueTicketProcessService.lambdaUpdate()
+                    .eq(QmsIssueTicketProcess::getId, processId)
+                    .set(request.getApprovalOpinion() != null,
+                            QmsIssueTicketProcess::getLeaderApprovalOpinion, request.getApprovalOpinion())
+                    .set(QmsIssueTicketProcess::getLeaderApprovalResult, request.getApprovalStatus())
+                    .set(QmsIssueTicketProcess::getLeaderUserId, currentUserId)
+                    .set(QmsIssueTicketProcess::getLeaderUserName, UserUtil.getUserName())
+                    .set(QmsIssueTicketProcess::getLeaderApprovalTime, now)
+                    .update();
+
             // 同意：检查同一工单下所有处理记录是否都已完成
             Long issueTicketId = process.getIssueTicketId();