From d65cc4cd967d9c8cbdc8a4dd7c803e952f01098f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 14:53:35 +0800
Subject: [PATCH] 修改用户登录接口 优化取水口绑定、解绑控制器接口

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index e514b8a..30c4b20 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -351,7 +351,7 @@
         cli.phone,
         cli.idCard,
         cli.area,
-        (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount,
+        (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount,
         cli.address,
         cli.remarks,
         cli.operateDt
@@ -380,6 +380,10 @@
       <if test = "address != null and address !=''">
         AND cli.address like CONCAT('%',#{address},'%')
       </if>
+
+      <if test = "villageId != null and villageId !=''">
+        AND cli.villageId =  #{villageId}
+      </if>
     </where>
     ORDER BY cli.operateDt DESC
     <trim prefix="limit " >
@@ -396,7 +400,7 @@
 
   <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤-->
   <select id="getAreaCodeById" resultType="java.lang.Long">
-    SELECT districtNum FROM se_client WHERE id = ${clientId}
+    SELECT districtNum FROM se_client WHERE id = #{clientId}
   </select>
 
   <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID-->
@@ -431,7 +435,7 @@
 
   <!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
   <select id="getWaterTypes" resultType="java.util.Map">
-    SELECT id, typeName from se_water_type
+    SELECT CAST(se_water_type.id AS char) AS id, typeName from se_water_type
   </select>
 
   <!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->

--
Gitblit v1.8.0