From a4fb3e36b92a1bc40d678667afca72dc1dac627c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 28 三月 2024 16:27:43 +0800
Subject: [PATCH] 完善条件查询监测站 不填数据会出现查不到的情况
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
index 65ce426..0691e30 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
@@ -211,10 +211,10 @@
<select id="getRecordCountOfFlowMonitoring" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCountOfFlowMonitoring
from pr_flow_monitoring pfm
- INNER JOIN ba_district country ON pfm.countyId = country.id
- INNER JOIN ba_district town ON pfm.townId = town.id
- INNER JOIN ba_district village ON pfm.villageId = village.id
LEFT JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id
+ LEFT JOIN ba_district country ON pfm.countyId = country.id
+ LEFT JOIN ba_district town ON pfm.townId = town.id
+ LEFT JOIN ba_district village ON pfm.villageId = village.id
<where>
pfm.deleted = 0
<if test = "name != null and name !=''">
@@ -233,10 +233,11 @@
pfm.`name` AS `name`,
pmofl.operateType AS bindState
from pr_flow_monitoring pfm
- INNER JOIN ba_district country ON pfm.countyId = country.id
- INNER JOIN ba_district town ON pfm.townId = town.id
- INNER JOIN ba_district village ON pfm.villageId = village.id
LEFT JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id
+ LEFT JOIN ba_district country ON pfm.countyId = country.id
+ LEFT JOIN ba_district town ON pfm.townId = town.id
+ LEFT JOIN ba_district village ON pfm.villageId = village.id
+
<where>
pfm.deleted = 0
<if test = "name != null and name !=''">
--
Gitblit v1.8.0