From e7c48d5e68fa9405cbb745b39d77503fe29c3efa Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 25 三月 2024 15:10:10 +0800
Subject: [PATCH] 	修改添加控制器 同步添加取水口控制器关联表

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index f139fd2..8520b12 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -172,7 +172,7 @@
         INNER JOIN pr_intake inta ON con.intakeId = inta.id
     <where>
       AND ic.operateType = 1
-      AND deleted = 0
+      AND con.deleted = 0
 
       <if test = "id != null and id > 0">
         AND con.id = ${id}
@@ -191,6 +191,7 @@
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
   <select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
     SELECT
+        CAST(con.id AS char) AS id,
         con.rtuAddr AS rtuAddr,
         inta.name AS intakeName,
         (SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
@@ -200,7 +201,7 @@
         INNER JOIN pr_intake inta ON con.intakeId = inta.id
     <where>
       AND ic.operateType = 1
-      AND deleted = 0
+      AND con.deleted = 0
 
       <if test = "id != null and id > 0">
         AND con.id = ${id}

--
Gitblit v1.8.0