From 23f8f5155749bbe0d2494c52d8adc3e6476b9cac Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 20 十二月 2023 17:23:55 +0800
Subject: [PATCH] 2023-12-20 朱宝民 IC卡15个接口重构,角色授权,获取用户信息

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
index f84a50d..941c01e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeActiveCardMapper.xml
@@ -164,9 +164,9 @@
     SELECT
         COUNT(*) AS recordCount
     FROM se_active_card act
-        INNER JOIN ba_client cli ON act.clientNum = cli.num
-        INNER JOIN se_client_card card ON act.cardNum = card.cardNum
-        , (SELECT @i:=0) AS itable
+      INNER JOIN ba_client cli ON act.clientNum = cli.num
+      INNER JOIN se_client_card card ON act.cardNum = card.cardNum
+      , (SELECT @i:=0) AS itable
     <where>
       <if test = "operateType != null and operateType > 0">
         AND act.operateType = ${operateType}
@@ -175,10 +175,6 @@
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </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},'%')
@@ -199,13 +195,13 @@
     SELECT
         (@i:=@i+1) AS id,
         cli.`name` AS clientName,
-        cli.id AS clientId,
-        card.cardAddr,
+        cli.num AS clientNum,
+        card.cardNum,
         card.state,
         (CASE
-        WHEN card.state = 1 THEN "姝e父"
-        WHEN card.state = 2 THEN "宸叉敞閿�"
-        ELSE "宸叉寕澶�"
+          WHEN card.state = 1 THEN "姝e父"
+          WHEN card.state = 2 THEN "宸叉敞閿�"
+          ELSE "宸叉寕澶�"
         END) AS stateName,
         act.reissueAmount,
         act.cardCost,
@@ -224,10 +220,6 @@
       <if test = "clientName != null and clientName !=''">
         AND cli.name like CONCAT('%',#{clientName},'%')
       </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},'%')

--
Gitblit v1.8.0