From 9f8524a2bc993aad40b3536789a6cef9a30aea76 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Fri, 18 Jul 2025 17:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E6=9D=83=E9=99=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/controller/ConsumeController.java     |  1 +
 src/main/resources/mapper/ConsumeMapper.xml                | 14 +++++++++++---
 src/main/resources/mapper/RechargeMapper.xml               | 14 ++++++++------
 src/main/resources/mapper/RefundMapper.xml                 | 14 ++++++++------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java
index 6b8a633..05734d9 100644
--- a/src/main/java/com/example/demo/controller/ConsumeController.java
+++ b/src/main/java/com/example/demo/controller/ConsumeController.java
@@ -70,6 +70,7 @@ public class ConsumeController {
                 return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser()));
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return Result.error("请检查筛选数据的格式");
         }
 
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 24ebae1..b0ced1a 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -25,10 +25,11 @@
             ugr.type = 1 AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" close=")" separator=",">
-                    #{market}
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
                 </foreach>
+                )
             </if>
         </where>
 
@@ -91,6 +92,13 @@
         admin a ON ugr.admin_id = a.id
         <where>
             ugr.type = 1 AND ugr.flag = 1
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
+                </foreach>
+                )
+            </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
             </if>
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 400dc42..52d4dbc 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -29,10 +29,11 @@
             AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" close=")" separator=",">
-                    #{market}
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
                 </foreach>
+                )
             </if>
         </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
@@ -97,10 +98,11 @@
             AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" close=")" separator=",">
-                    #{market}
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
                 </foreach>
+                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index dc8b5bd..46a89a0 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -27,10 +27,11 @@
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" close=")" separator=",">
-                    #{market}
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
                 </foreach>
+                )
             </if>
         </where>
         <trim prefix="ORDER BY" suffixOverrides=",">
@@ -95,10 +96,11 @@
         <where>
             ugr.type = 2 AND ugr.audit_status IN (1,3) AND ugr.flag = 1
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND u.market IN
-                <foreach collection="markets" item="market" open="(" close=")" separator=",">
-                    #{market}
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    u.market LIKE CONCAT('%', #{market}, '%')
                 </foreach>
+                )
             </if>
             <if test="jwcode != null and jwcode != ''">
                 AND ugr.jwcode = #{jwcode}