diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
index fa18379f..afce820c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TicketSolutionAudit.java
@@ -1,8 +1,6 @@
 package com.nflg.mobilebroken.repository.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -47,11 +45,13 @@ public class TicketSolutionAudit implements Serializable {
     /**
      * 审核状态，0：不通过；1：通过
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Integer state;
 
     /**
      * 审核不通过的原因
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String reason;
 
     /**
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..0b4abbdf 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
@@ -77,12 +77,12 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
         List<TicketSolutionAudit> forUpdate=new ArrayList<>();
         Ticket ticket=ticketService.getById(request.getTicketId());
         request.getDepartments().forEach(detp->{
-            TicketSolutionAudit audit=new TicketSolutionAudit()
-                    .setTicketId(request.getTicketId())
-                    .setDeptName(detp.getDeptName())
-                    .setUserId(detp.getUserId())
-                    .setCreateTime(LocalDateTime.now());
+            TicketSolutionAudit audit = new TicketSolutionAudit();
             if (Objects.isNull(detp.getId())){
+                audit.setTicketId(request.getTicketId());
+                audit.setDeptName(detp.getDeptName());
+                audit.setUserId(detp.getUserId());
+                audit.setCreateTime(LocalDateTime.now());
                 forAdd.add(audit);
                 VUtils.trueThrowBusinessError(lambdaQuery()
                                 .eq(TicketSolutionAudit::getTicketId, request.getTicketId())
@@ -104,7 +104,8 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
             }else {
                 audit.setId(detp.getId());
                 TicketSolutionAudit entity=getById(detp.getId());
-                if (!Objects.equals(entity.getUserId(), detp.getUserId())){
+                if (!Objects.equals(entity.getUserId(), detp.getUserId()) || Objects.equals(entity.getState(), 0)) {
+                    adminMessageService.remove(0, ticket.getId(), entity.getUserId(), MessageSubType.TicketSolutionAudit.getState());
                     adminMessageService.add(
                             new AdminMessage()
                                     .setNo(ticket.getNo())
@@ -117,7 +118,6 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
                                     .setIsRead(false)
                                     .setCreateTime(LocalDateTime.now())
                     );
-                    adminMessageService.remove(0,ticket.getId(),entity.getUserId(),MessageSubType.TicketSolutionAudit.getState());
                     audit.setState(null);
                     audit.setReason(null);
                 }
@@ -150,7 +150,13 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl<TicketSolutionAu
                         .eq(TicketSolutionAudit::getUserId, userId)
                         .eq(TicketSolutionAudit::getState, 1)
                         .exists())
-                .throwMessage("已通过后不能再次审核");
+                .throwMessage("请勿重复审核");
+        VUtils.trueThrowBusinessError(lambdaQuery()
+                        .eq(TicketSolutionAudit::getTicketId, request.getTicketId())
+                        .eq(TicketSolutionAudit::getUserId, userId)
+                        .eq(TicketSolutionAudit::getState, 0)
+                        .exists())
+                .throwMessage("请等待CQM修改方案后再审核");
         if(lambdaUpdate()
                 .set(TicketSolutionAudit::getState,0)
                 .set(TicketSolutionAudit::getReason,request.getReason())