From d3a14776825ee29df1f0ecca01af798775ab8c54 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 17 Sep 2025 15:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=EF=BC=8CBU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/biutag/lan/service/MailAppealService.java   | 4 ++++
 .../src/main/java/com/biutag/lan/service/WorkService.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/MailAppealService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/MailAppealService.java
index f1d30c8..53fce4c 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/MailAppealService.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/MailAppealService.java
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 @RequiredArgsConstructor
 @Service
@@ -115,6 +116,9 @@ public class MailAppealService extends ServiceImpl<MailAppealMapper, MailAppeal>
                         .setUpdateTime(now)
                         .setFirstHandleTime(now);
             } else {
+                if (StrUtil.isBlank(approval.getFirstLeaderEmpNo())) {
+                    throw new RuntimeException("该信件已有其他市局专班审批，建议复制审批意见，刷新浏览器后，报上级领导审批！");
+                }
                 appeal.setStep("3")
                         .setFirstHandlerEmpNo2(AdminThreadLocal.getEmpNo())
                         .setFirstHandlerName2(AdminThreadLocal.getPoliceName())
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
index 0528d15..e5a78a8 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/WorkService.java
@@ -696,7 +696,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
                     }
                     break;
                 case "3":
-                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_CLASSES_LEADER.getRoleId())) {
+                    if (AdminThreadLocal.getRoleId().equals(RoleEnum.MUNICIPAL_CLASSES_LEADER.getRoleId()) && AdminThreadLocal.getEmpNo().equals(workVo.getFirstLeaderEmpNo())) {
                         workVo.setIfHandle(1);
                     }
                     break;