From cb7ca191bf7dfe5db4dc30f1576f8c5362761154 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 18:38:02 +0800
Subject: [PATCH] 修改bug，协议中报警及状态是4个字节，程序实现中当2个字节
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 48495b9..8f5ca51 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,12 +275,12 @@
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>
--
Gitblit v1.8.0