From 1a85e9116325df58dfef43f5a3cfbd6c5d3819c0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 19 九月 2024 14:15:59 +0800
Subject: [PATCH] 2024-09-19 朱宝民 获取简单用户信息接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
index 91c62a2..1348a36 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -239,12 +239,12 @@
         COUNT(*) AS recordCount
     FROM pr_divide divi
         INNER JOIN ba_block blo ON divi.blockId = blo.id
-        INNER JOIN ba_district country ON divi.countyId = country.id
-        INNER JOIN ba_district town ON divi.townId = town.id
-        INNER JOIN ba_district village ON divi.villageid = village.id
+        Left JOIN ba_district country ON divi.countyId = country.id
+        Left JOIN ba_district town ON divi.townId = town.id
+        Left JOIN ba_district village ON divi.villageid = village.id
         , (SELECT @i:=0) AS itable
     <where>
-      AND divi. deleted = 0
+       divi. deleted = 0
       <if test = "divideName != null and divideName !=''">
         AND divi.name LIKE CONCAT('%',#{divideName},'%')
       </if>
@@ -275,17 +275,17 @@
       divi.operateDt
     FROM pr_divide divi
         INNER JOIN ba_block blo ON divi.blockId = blo.id
-        INNER JOIN ba_district country ON divi.countyId = country.id
-        INNER JOIN ba_district town ON divi.townId = town.id
-        INNER JOIN ba_district village ON divi.villageid = village.id
+        Left JOIN ba_district country ON divi.countyId = country.id
+        Left JOIN ba_district town ON divi.townId = town.id
+        Left JOIN ba_district village ON divi.villageid = village.id
         , (SELECT @i:=0) AS itable
     <where>
-      AND divi. deleted = 0
+       divi. deleted = 0
       <if test = "divideName != null and divideName !=''">
         AND divi.name LIKE CONCAT('%',#{divideName},'%')
       </if>
 
-      <if test = "blockId != null">
+      <if test = "blockId != null and blockId !=''">
         AND divi.blockId = #{blockId}
       </if>
     </where>
@@ -302,14 +302,23 @@
     update pr_divide set deleted = 1
     <where>
       <if test = "id != null and id > 0">
-        AND id = ${id}
+        AND id = #{id}
       </if>
     </where>
   </update>
 
   <!--鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙�-->
   <select id="getBlockIdById" resultType="java.lang.Long">
-    SELECT blockId FROM pr_divide WHERE id = ${divideId}
+    SELECT blockId FROM pr_divide WHERE id = #{divideId}
+  </select>
+
+  <!--鏍规嵁鐗囧尯ID鑾峰彇鍒嗘按鎴垮垪琛�-->
+  <select id="getDividesByBlockId" resultType="com.dy.pipIrrGlobal.voPr.VoSimpleDivide">
+    SELECT
+      id As value,
+      name AS label
+    FROM pr_divide
+    WHERE deleted = 0 AND blockId = #{blockId}
   </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0