From 34de001dddaee1547da4f6a836f6ecdfc99f3374 Mon Sep 17 00:00:00 2001
From: funny <834502597@qq.com>
Date: Wed, 13 May 2026 18:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/admin/service/QmsIssueTicketControllerService.java  | 2 +-
 .../service/QmsIssueTicketProcessControllerService.java     | 6 +++---
 .../QmsIssueTicketProcessMeasureControllerService.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
index bdbdb09f..18a009c9 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
@@ -2031,7 +2031,7 @@ public class QmsIssueTicketControllerService {
                     }
                 }
                 // 拼接领导姓名与审批意见
-                String approvalText = process.getLeaderApprovalResult() == 1 ? "同意" : "驳回";
+                String approvalText = process.getLeaderApprovalResult() == 0 ? "同意" : "驳回";
                 String leaderDisplay;
                 if (StrUtil.isNotBlank(process.getLeaderApprovalOpinion())) {
                     leaderDisplay = process.getLeaderUserName() + "（" + approvalText + "：" + process.getLeaderApprovalOpinion() + "）";
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 39a2f791..d5e0fec1 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
@@ -254,7 +254,7 @@ public class QmsIssueTicketProcessControllerService {
 
         Short leaderApprovalResult = request.getApprovalStatus();
 
-        if (leaderApprovalResult == 0) {
+        if (leaderApprovalResult == 1) {
             // 驳回：推送待办给处理人
             Long sourceTypeId = dictionaryItemService.getIdByCode("MessageType", "InspectionTaskWorkOrder");
             User handler = userService.getById(process.getHandlerUserId());
@@ -262,7 +262,7 @@ public class QmsIssueTicketProcessControllerService {
                     .setTicketId(ticket.getId())
                     .setHandlerUserId(process.getHandlerUserId());
             issueTicketToDoService.save(todoItem);
-        } else if (leaderApprovalResult == 1) {
+        } else if (leaderApprovalResult == 0) {
             // 同意：检查同一工单下所有处理记录是否都已完成
             Long issueTicketId = process.getIssueTicketId();
 
@@ -270,7 +270,7 @@ public class QmsIssueTicketProcessControllerService {
             long notCompleted = issueTicketProcessService.lambdaQuery()
                     .eq(QmsIssueTicketProcess::getIssueTicketId, issueTicketId)
                     .and(w -> w
-                            .ne(true, QmsIssueTicketProcess::getLeaderApprovalResult, (short) 1)
+                            .ne(true, QmsIssueTicketProcess::getLeaderApprovalResult, (short) 0)
                             .or()
                             .isNull(QmsIssueTicketProcess::getLeaderApprovalResult))
                     .and(w -> w
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
index 0f040108..190755c8 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
@@ -52,7 +52,7 @@ public class QmsIssueTicketProcessMeasureControllerService {
         QmsIssueTicketProcess process = findProcessByTicketAndUser(request.getId(), currentUserId);
 
         // 校验：领导已同意时不允许修改
-        if (process.getLeaderApprovalResult() != null && process.getLeaderApprovalResult() == 1) {
+        if (process.getLeaderApprovalResult() != null && process.getLeaderApprovalResult() == 0) {
             throw new NflgException(STATE.BusinessError, "领导已审批同意，不允许修改");
         }