From e2c84b94b90fba4c8b15a476edd6731586f14626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 27 May 2026 08:22:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(UserBalanceLog):=20=E4=BC=98=E5=8C=96=20SQL?=
 =?UTF-8?q?=20=E5=8F=82=E6=95=B0=E7=A9=BA=E5=80=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个 SQL 查询条件中添加参数非空且非空字符串判断
- 防止空字符串导致的错误匹配或异常
- 统一调整语句格式，保持代码规范和可读性
- 优化关联查询时参数过滤逻辑，提升查询准确性
---
 .../system/mapper/xml/UserBalanceLogMapper.xml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserBalanceLogMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserBalanceLogMapper.xml
index 965aed7..68d2e0c 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserBalanceLogMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserBalanceLogMapper.xml
@@ -5,7 +5,7 @@
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*,
-               b.nickname,b.avatar,b.phone
+               b.nickname, b.avatar, b.phone
         FROM sys_user_balance_log a
         LEFT JOIN sys_user b ON a.user_id = b.user_id
         <where>
@@ -18,7 +18,7 @@
             <if test="param.scene != null">
               AND a.scene = #{param.scene}
             </if>
-            <if test="param.sceneMultiple != null">
+            <if test="param.sceneMultiple != null and param.sceneMultiple != ''">
               AND a.scene IN
               <foreach collection="param.sceneMultiple.split(',')" item="item" separator="," open="(" close=")">
                 #{item}
@@ -30,16 +30,16 @@
             <if test="param.balance != null">
                 AND a.balance = #{param.balance}
             </if>
-            <if test="param.describe != null">
+            <if test="param.describe != null and param.describe != ''">
                 AND a.describe LIKE CONCAT('%', #{param.describe}, '%')
             </if>
-            <if test="param.remark != null">
+            <if test="param.remark != null and param.remark != ''">
                 AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
             </if>
             <if test="param.sortNumber != null">
                 AND a.sort_number = #{param.sortNumber}
             </if>
-            <if test="param.comments != null">
+            <if test="param.comments != null and param.comments != ''">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>
             <if test="param.status != null">
@@ -51,7 +51,7 @@
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>
-            <if test="param.merchantCode != null">
+            <if test="param.merchantCode != null and param.merchantCode != ''">
                 AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
             </if>
             <if test="param.createTimeStart != null">
@@ -60,7 +60,7 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
-            <if test="param.keywords != null">
+            <if test="param.keywords != null and param.keywords != ''">
               AND (
               a.user_id = #{param.keywords}
               OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')