From e371b44dd7cffd4434adbf63acd0bcd65ed00d00 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 27 六月 2024 09:43:51 +0800
Subject: [PATCH] 1. 营销模块下根据农户姓名、电话查询正常状态的水卡列表； 2. 小程序模块下根据农户ID获取正常状态的水卡列表
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrDivideMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 f50103b..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,9 +239,9 @@
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>
divi. deleted = 0
@@ -275,16 +275,15 @@
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>
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}
--
Gitblit v1.8.0