From 42d3324a769d5ccf315194e699bcd0858d7ab81d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 20 Dec 2023 18:23:13 +0800
Subject: [PATCH] 取保候审按钮放开
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 29 +++++++++++++++++------------
1 files changed, 17 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..7d40566 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
+ and jda.doorplate_type = '户室牌'
<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 (
@@ -343,16 +345,18 @@
WHERE
jda.nei_code = #{code}
AND jhh.is_deleted = 0
+ and jda.doorplate_type = '户室牌'
<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 (
@@ -383,16 +387,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