From 8c0fcc2562e4088c079ed1d937695d614a9e47c9 Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Tue, 10 Feb 2026 16:32:05 +0800
Subject: [PATCH] =?UTF-8?q?2=E6=9C=8810=E6=97=A5=EF=BC=8C=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E7=BB=99=E6=8C=87=E5=AE=9A=E6=89=A7=E8=A1=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/cashMapper/MessageMapper.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml
index 23e801f..f486cbe 100644
--- a/src/main/resources/cashMapper/MessageMapper.xml
+++ b/src/main/resources/cashMapper/MessageMapper.xml
@@ -26,15 +26,16 @@
         LEFT JOIN market mk ON m.market = mk.id
         <where>
             m.flag = 0
-            <if test="status != null and status.size() > 0">
-                AND m.status IN
-                <foreach item="item" collection="status" open="(" separator="," close=")">
+            <!-- 当 executor 不为 null 时，跳过 markets 过滤 -->
+            <if test="executor == null and markets != null and markets.size() > 0">
+                AND m.market IN
+                <foreach item="item" collection="markets" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="markets != null and markets.size() > 0">
-                AND m.market IN
-                <foreach item="item" collection="markets" open="(" separator="," close=")">
+            <if test="status != null and status.size() > 0">
+                AND m.status IN
+                <foreach item="item" collection="status" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>