From 1d4e79c0712d386edbe3f7471c4fe23125e8a03a Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Wed, 25 Dec 2024 16:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/RechargeMapper.java | 2 +-
 src/main/java/com/example/demo/mapper/RefundMapper.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java
index 9e81b18..a2551a7 100644
--- a/src/main/java/com/example/demo/mapper/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java
@@ -58,7 +58,7 @@ public interface RechargeMapper {
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>",
             "<if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>",
-            "<if test='area!=null and area.length>0'>and area=#{area}</if>",
+            "<if test='area!=null and area.length>0'>and user.area=#{area}</if>",
             "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",
             "ORDER BY recharge.create_time DESC",
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index 7ea31cd..3071b1f 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -76,9 +76,10 @@ public interface RefundMapper {
             "LEFT JOIN audit au ON d.detail_id = au.refund_id",
             "WHERE d.detail_flag = 1 and update_type = 2 ",
             "<if test='status!=null'>and au.status=#{status}</if>",
+            "<if test='area!=null and area.length>0'>AND u.area = #{area}</if>",
             "<if test='jwcode != null'>AND d.jwcode = #{jwcode}</if>",
-            "<if test='refundType != null'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>",
-            "<if test='refundGoods != null'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>",
+            "<if test='refundType != null and refundType.length>0'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>",
+            "<if test='refundGoods != null and refundGoods.length>0'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>",
             "<if test='startDate != null and endDate != null'>AND d.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "ORDER BY d.create_time DESC",
             "</script>"