From 80d384b639f7bdc9f325d9b1fa51a95beb3093c1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 20 Dec 2023 15:53:19 +0800
Subject: [PATCH] 统计接口优化
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index f85fa3d..bb019e7 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -267,12 +267,12 @@
and jda.building_code=#{buildingCode}
</if>
- <if test="uniCode != null and uniCode != ''">
- and jda.unit_code=#{uniCode}
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
</if>
<if test="aoiCode != null and aoiCode != ''">
- and jda.aoi_code=#{aoiCode}}
+ and jda.aoi_code=#{aoiCode}
</if>
<if test="userId != null">
AND jda.address_code IN (
@@ -305,16 +305,18 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
+
<if test="buildingCode != null and buildingCode != ''">
and jda.building_code=#{buildingCode}
</if>
- <if test="uniCode != null and uniCode != ''">
- and jda.unit_code=#{uniCode}
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ AND jda.unit_code is not null
</if>
<if test="aoiCode != null and aoiCode != ''">
- and jda.aoi_code=#{aoiCode}}
+ and jda.aoi_code=#{aoiCode}
</if>
<if test="userId != null">
AND jda.address_code IN (
@@ -347,12 +349,13 @@
and jda.building_code=#{buildingCode}
</if>
- <if test="uniCode != null and uniCode != ''">
- and jda.unit_code=#{uniCode}
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ AND jda.unit_code is not null
</if>
<if test="aoiCode != null and aoiCode != ''">
- and jda.aoi_code=#{aoiCode}}
+ and jda.aoi_code=#{aoiCode}
</if>
<if test="userId != null">
AND jda.address_code IN (
@@ -383,16 +386,17 @@
WHERE
jda.nei_code = #{code}
AND jh.is_deleted = 0
+ AND jda.unit_code is not null
<if test="buildingCode != null and buildingCode != ''">
and jda.building_code=#{buildingCode}
</if>
- <if test="uniCode != null and uniCode != ''">
- and jda.unit_code=#{uniCode}
+ <if test="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
</if>
<if test="aoiCode != null and aoiCode != ''">
- and jda.aoi_code=#{aoiCode}}
+ and jda.aoi_code=#{aoiCode}
</if>
<if test="userId != null">
AND jda.address_code IN (
--
Gitblit v1.9.3