From 927beadbb05d22759efc4d60c931f906bffa511d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 20:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 1b18b3c..d3a106c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -370,7 +370,7 @@
                          END)  AS state
               FROM se_virtual_card vc
                        INNER JOIN se_client cli ON cli.id = vc.client_id
-              WHERE vc.client_id = #{clientId,jdbcType=BIGINT}
+              WHERE vc.state = 1 AND vc.client_id = #{clientId,jdbcType=BIGINT}
         ) card
         ORDER BY card.Money DESC, card.State DESC
     </select>
@@ -454,7 +454,7 @@
     <select id="getCardsCount" parameterType="java.util.Map" resultType="java.lang.Long">
         SELECT COUNT(*) AS recordCount
         FROM se_client_card card
-            INNER JOIN se_client cli ON card.clientId = cli.id
+            LEFT JOIN se_client cli ON card.clientId = cli.id
         <where>
             AND card.state = 1
             <if test="clientNum != null and clientNum != ''">
@@ -483,7 +483,7 @@
             '鍐滄埛鍗�' AS cardType,
             FORMAT(card.money, 2) AS money
         FROM se_client_card card
-            INNER JOIN se_client cli ON card.clientId = cli.id
+            LEFT JOIN se_client cli ON card.clientId = cli.id
         <where>
             AND card.state = 1
             <if test="clientNum != null and clientNum != ''">

--
Gitblit v1.8.0