From 5c3ba107b6fe756c5eab6cc83bb18ad0c8c5d9ec Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 五月 2024 21:10:52 +0800
Subject: [PATCH] 实现王江海制定的协议实现到3.30节（功能码0x87）
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 a33f952..f50103b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -238,13 +238,13 @@
SELECT
COUNT(*) AS recordCount
FROM pr_divide divi
-<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
+ 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
, (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>
@@ -262,7 +262,7 @@
CAST(divi.id AS char) AS divideId,
divi.name AS divideName,
CAST(divi.blockId AS char) AS blockId,
-<!-- blo.`name` AS blockName,-->
+ blo.`name` AS blockName,
divi.header,
divi.villages,
divi.area,
@@ -274,17 +274,18 @@
CAST(divi.operator AS char) AS operator,
divi.operateDt
FROM pr_divide divi
-<!-- INNER JOIN ba_block blo ON divi.blockId = blo.id-->
+ 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
, (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 and blockId !=''">
AND divi.blockId = #{blockId}
</if>
--
Gitblit v1.8.0