From 62111aefd45e531cfddaf5e8d21136c8a9499942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 28 Aug 2025 15:27:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-635=20CQM=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=BB=93=E6=A1=88=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=87=BA=E4=BA=8E?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=AD=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=90=8C=E6=84=8F=E7=9A=84=E5=B7=A5=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BB=BB=E4=BD=95=E4=BA=BA=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9B=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E8=BF=98=E6=9C=AA=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=EF=BC=8C=E6=88=96=E8=80=85=E5=AE=A1=E6=A0=B8=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E7=9A=84=EF=BC=8C=E6=89=8D=E5=85=81=E8=AE=B8CQM?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/service/ITicketSolutionAuditService.java     | 3 +++
 .../service/impl/TicketSolutionAuditServiceImpl.java        | 6 ++++++
 .../repository/service/impl/TicketSolutionServiceImpl.java  | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionAuditService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionAuditService.java
index cc39f1de..1961610a 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionAuditService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketSolutionAuditService.java
@@ -7,6 +7,7 @@ import com.nflg.mobilebroken.common.pojo.vo.SolutionReviewDepartmentVO;
 import com.nflg.mobilebroken.repository.entity.Ticket;
 import com.nflg.mobilebroken.repository.entity.TicketSolutionAudit;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -28,4 +29,6 @@ public interface ITicketSolutionAuditService extends IService<TicketSolutionAudi
     boolean pass(Integer ticketId);
 
     TicketSolutionAudit getByTicketAndUser(Integer ticketId, Integer userId);
+
+    boolean canUpdate(@NotNull Integer ticketId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
index 24819740..23c591ea 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java
@@ -201,4 +201,10 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
                 .last("limit 1")
                 .one();
     }
+
+    @Override
+    public boolean canUpdate(Integer ticketId) {
+        List<TicketSolutionAudit> list = lambdaQuery().eq(TicketSolutionAudit::getTicketId, ticketId).list();
+        return CollectionUtil.isEmpty(list) || list.stream().anyMatch(it -> Objects.equals(0, it.getState()));
+    }
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
index aa1730c7..e94eb028 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
@@ -121,7 +121,10 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
         VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.Processing.getState())
                         && !Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState()))
                 .throwMessage("当前工单状态不允许修改解决方案");
-        Integer userId=AdminUserUtil.getUserId();
+        VUtils.trueThrowBusinessError(Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState())
+                        && !ticketSolutionAuditService.canUpdate(request.getTicketId()))
+                .throwMessage("部门主管审核中，不允许修改解决方案");
+        Integer userId = AdminUserUtil.getUserId();
         List<Integer> cqmIds=adminUserService.getCQMIds();
         List<Integer> handleIds= StrUtil.split(ticket.getHandle(),",").stream().map(Integer::parseInt).collect(Collectors.toList());
         VUtils.trueThrowBusinessError(cqmIds.stream().noneMatch(uid -> Objects.equals(uid, userId))