From 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Dec 2023 20:43:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 3db9562..f85fa3d 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -161,8 +161,8 @@
jh.*,
jhl.id as cid,jhl.*,jhl.remark as cremark
from jczz_house jh
- left join jczz_user_house_label jhl on jh.house_code = jhl.house_code
- where jh.is_deleted = 0 and jhl.lable_type = 2
+ left join jczz_user_house_label jhl on jh.house_code = jhl.house_code and jhl.lable_type = 2
+ where jh.is_deleted = 0
and jh.house_code = #{house.houseCode}
</select>
@@ -263,6 +263,17 @@
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>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
@@ -294,6 +305,17 @@
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>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
@@ -321,6 +343,17 @@
WHERE
jda.nei_code = #{code}
AND jhh.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>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT
@@ -350,6 +383,17 @@
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>
+
+ <if test="aoiCode != null and aoiCode != ''">
+ and jda.aoi_code=#{aoiCode}}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
--
Gitblit v1.9.3