From c231d7b880f2e97aefae196c24f16f80ffe5dc42 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 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..91c62a2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml
@@ -238,7 +238,7 @@
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
@@ -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,7 +274,7 @@
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
@@ -285,7 +285,7 @@
AND divi.name LIKE CONCAT('%',#{divideName},'%')
</if>
- <if test = "blockId != null and blockId !=''">
+ <if test = "blockId != null">
AND divi.blockId = #{blockId}
</if>
</where>
--
Gitblit v1.8.0