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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 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..7d40566 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="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ </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,19 @@
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="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}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT DISTINCT
@@ -321,6 +345,19 @@
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="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}
+ </if>
<if test="userId != null">
AND jda.address_code IN (
SELECT
@@ -350,6 +387,18 @@
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="unitCode != null and unitCode != ''">
+ and jda.unit_code=#{unitCode}
+ </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