From 3dc2929d22a5f437fbee133df66aaff26a10d243 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 13 九月 2024 09:47:10 +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 | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 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 c947dc6..5f2f303 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml @@ -346,17 +346,17 @@ <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級--> <select id="getCardInfoByClientId" resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo"> SELECT * - FROM (SELECT '鐗╃悊鍗�' AS cardType, - clientCard.cardNum AS cardNum, - clientCard.money AS money, + FROM (SELECT '鐗╃悊鍗�' AS cardType, + card.cardNum AS cardNum, + card.money AS money, (CASE - WHEN clientCard.state = 1 THEN '姝e父' - WHEN clientCard.state = 2 THEN '宸叉敞閿�' + WHEN card.state = 1 THEN '姝e父' + WHEN card.state = 2 THEN '宸叉敞閿�' ELSE '宸叉寕澶�' - END) AS state - FROM se_client client - LEFT JOIN se_client_card clientCard ON clientCard.clientId = client.id - WHERE client.id = #{clientId,jdbcType=BIGINT} + END) AS state + FROM se_client_card card + INNER JOIN se_client cli ON cli.id = card.clientId + WHERE card.clientId = #{clientId,jdbcType=BIGINT} UNION ALL SELECT '铏氭嫙鍗�' AS cardType, vc.vc_num AS cardNum, -- Gitblit v1.8.0