From a30be18fa7896e36943462aef9e9949f0acf7f5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 14:34:45 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
index 00fe845..74c067d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -190,24 +190,18 @@
     select
         COUNT(*) AS recordCount
     FROM se_recharge_history rec
-    INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
-    INNER JOIN ba_client cli ON rec.clientNum = cli.num
-    , (SELECT @i:=0) AS itable
+        INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
+        INNER JOIN ba_client cli ON rec.clientNum = cli.num
+        , (SELECT @i:=0) AS itable
     <where>
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-      <!--      <if test = "clientId != null and clientId > 0">-->
-      <!--        AND rec.clientId like CONCAT('%',#{clientId},'%')-->
-      <!--      </if>-->
       <if test = "clientNum != null and clientNum > 0">
         AND rec.clientNum like CONCAT('%',#{clientNum},'%')
       </if>
 
-      <!--      <if test = "cardAddr != null and cardAddr !=''">-->
-      <!--        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
-      <!--      </if>-->
       <if test = "cardNum != null and cardNum !=''">
         AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>
@@ -244,16 +238,10 @@
         AND cli.name like CONCAT('%',#{clientName},'%')
       </if>
 
-<!--      <if test = "clientId != null and clientId > 0">-->
-<!--        AND rec.clientId like CONCAT('%',#{clientId},'%')-->
-<!--      </if>-->
       <if test = "clientNum != null and clientNum > 0">
         AND rec.clientNum like CONCAT('%',#{clientNum},'%')
       </if>
 
-<!--      <if test = "cardAddr != null and cardAddr !=''">-->
-<!--        AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
-<!--      </if>-->
       <if test = "cardNum != null and cardNum !=''">
         AND card.cardNum like CONCAT('%',#{cardNum},'%')
       </if>

--
Gitblit v1.8.0