From bd448b121e9b7636daa4ec1d1629c3c2615fb2b9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 03 八月 2024 11:36:03 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
index 7275f77..0c43003 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmClientAmountDayMapper.xml
@@ -184,10 +184,10 @@
     from rm_client_amount_day rcad
            Left join se_client sc on sc.id = rcad.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="clientId != null">
+      <if test="clientId != null and clientId != ''">
         and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">
@@ -215,10 +215,10 @@
     from rm_client_amount_day rcad
     Left join se_client sc on sc.id = rcad.client_id
     <where>
-      <if test="clientName != null">
+      <if test="clientName != null and clientName != '' ">
         and sc.name like CONCAT('%',#{clientName,jdbcType=VARCHAR},'%')
       </if>
-      <if test="clientId != null">
+      <if test="clientId != null and clientId != ''">
         and rcad.client_id = #{clientId}
       </if>
       <if test="startDt != null">

--
Gitblit v1.8.0