From 03024bbd484fa1a3d89fb9e95c788cf43078e20b Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Thu, 4 Sep 2025 12:09:19 +0800
Subject: [PATCH] 250904

---
 .../main/java/com/biutag/outeradmin/domain/dto/MailBo.java    | 2 ++
 .../main/java/com/biutag/outeradmin/service/MailService.java  | 4 +++-
 mailbox-outer/src/main/java/com/biutag/outer/job/Job.java     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/domain/dto/MailBo.java b/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/domain/dto/MailBo.java
index 72135ba..341ed77 100644
--- a/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/domain/dto/MailBo.java
+++ b/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/domain/dto/MailBo.java
@@ -38,5 +38,7 @@ public class MailBo {
      */
     private String satisfactionSms;
 
+    private String id;
+
 
 }
diff --git a/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/service/MailService.java b/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/service/MailService.java
index 1181c39..28855ae 100644
--- a/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/service/MailService.java
+++ b/mailbox-outer-admin/src/main/java/com/biutag/outeradmin/service/MailService.java
@@ -18,7 +18,9 @@ public class MailService extends ServiceImpl<MailMapper, Mail> {
         if (!query.getCreateTime().isEmpty()) {
             queryWrapper.between("m.create_time", query.getCreateTime().get(0), query.getCreateTime().get(0));
         }
-        queryWrapper.like(StrUtil.isNotBlank(query.getContactName()), "m.contact_name", query.getContactName())
+        queryWrapper
+                .like(StrUtil.isNotBlank(query.getId()), "m.id", query.getId())
+                .like(StrUtil.isNotBlank(query.getContactName()), "m.contact_name", query.getContactName())
                 .like(StrUtil.isNotBlank(query.getContactPhone()), "m.contact_phone", query.getContactPhone())
                 .like(StrUtil.isNotBlank(query.getContactIdCard()), "m.contact_id_card", query.getContactIdCard())
                 .like(StrUtil.isNotBlank(query.getContent()), "m.content", query.getContent())
diff --git a/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java b/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java
index 1cb51a2..b161355 100644
--- a/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java
+++ b/mailbox-outer/src/main/java/com/biutag/outer/job/Job.java
@@ -84,7 +84,7 @@ public class Job {
                     log.info("图片数量：{}", attachments.size());
                     for (JSONObject attachment : attachments) {
                         // 图片大于3张就压缩
-                        if (attachments.size() > 3) {
+                        if (attachments.size() >= 3) {
                             // 图片压缩
                             ByteArrayOutputStream os = new ByteArrayOutputStream();
                             Img.from(minio.getInputStream(attachment.getString("filepath"))).setQuality(0.5).write(os);