From fef879602f0911da1738c65a13eda5f2353a0b4f Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Thu, 4 Sep 2025 18:35:00 +0800
Subject: [PATCH] =?UTF-8?q?fit:=E4=BC=98=E5=8C=96=E4=BF=A1=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/biutag/supervision/service/DataThreadService.java     | 1 +
 src/main/java/com/biutag/supervision/service/MailService.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/biutag/supervision/service/DataThreadService.java b/src/main/java/com/biutag/supervision/service/DataThreadService.java
index ecdb3cb..d0fdf98 100644
--- a/src/main/java/com/biutag/supervision/service/DataThreadService.java
+++ b/src/main/java/com/biutag/supervision/service/DataThreadService.java
@@ -71,6 +71,7 @@ public class DataThreadService {
                LambdaQueryWrapper<DataMailbox> wrapper = new LambdaQueryWrapper<DataMailbox>()
                        .eq(DataMailbox::getProblemSourcesCode, ProblemSourcesEnum.JZXX.getValue())
                        .like(StrUtil.isNotBlank(queryParam.getOriginId()), DataMailbox::getOriginId, queryParam.getOriginId())
+                       .in(CollectionUtil.isNotEmpty(queryParam.getInvolvedIssue()),DataMailbox::getInvolvedIssue,queryParam.getInvolvedIssue())
                        .like(StrUtil.isNotBlank(queryParam.getThingDesc()), DataMailbox::getThingDesc, queryParam.getThingDesc());
                if (queryParam.getDiscoveryTime().size() == 2) {
                    wrapper.between(DataMailbox::getDiscoveryTime, queryParam.getDiscoveryTime().get(0), queryParam.getDiscoveryTime().get(1));
diff --git a/src/main/java/com/biutag/supervision/service/MailService.java b/src/main/java/com/biutag/supervision/service/MailService.java
index 672f66b..88781b3 100644
--- a/src/main/java/com/biutag/supervision/service/MailService.java
+++ b/src/main/java/com/biutag/supervision/service/MailService.java
@@ -74,6 +74,7 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
                 negative.setProblemSources(ProblemSourcesEnum.JZXX.getLabel());
                 negative.setProblemSourcesCode(ProblemSourcesEnum.JZXX.getValue());
                 negative.setBusinessTypeCode(BusinessTypeEnum.QT.getValue());
+
                 negative.setBusinessTypeName(BusinessTypeEnum.QT.getLabel());
                 if ("属实".equals(item.getVerifyIsTrue())) {
                     negative.setCheckStatus(InspectCaseEnum.TRUE.getValue());
@@ -187,13 +188,14 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
                 // 涉及个人
                 dataMailbox.setAccountabilityTarget(AccountabilityTargetEnum.PERSONAL.getValue());
                 dataMailbox.setCrtTime(LocalDateTime.now());
+
                 if("涉冻".equals(item.getMailCategory())){
                     dataMailbox.setInvolvedIssue("涉冻问题");
                 }
                 if("涉企".equals(item.getMailCategory())){
                     dataMailbox.setInvolvedIssue("涉企问题");
                 }
-                dataMailboxService.save(dataMailbox);
+                dataMailboxService.saveOrUpdate(dataMailbox);
 
                 // 被举报人
                 List<MailBlame> blames = mailBlames.stream().filter(mailBlame -> item.getId().equals(mailBlame.getMailId())).toList();