From bdc5d99198b06b9e3fd5e6794d2efea36398b60a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 11:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 35 +++++++++++++++++++++++------------
1 files changed, 23 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 0ab811e..b913764 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -138,8 +138,7 @@
br.town_name as townStreetName,br.name as neiName,
jg.grid_name
from jczz_house jh
- left join jczz_grid_range jgr on jgr.house_code = jh.house_code
- left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
<where>
<if test="house.id != null ">and jh.id = #{house.id}</if>
@@ -159,6 +158,9 @@
<if test="house.neiName!=null and house.neiName!=''">
and br.name like concat('%',#{house.neiName},'%')
</if>
+ <if test="house.address!=null and house.address!=''">
+ and jh.address like concat('%',#{house.address},'%')
+ </if>
<if test="house.houseName != null and house.houseName != ''">and jh.house_name like
concat('%',#{house.houseName},'%')
</if>
@@ -171,8 +173,18 @@
<if test="house.unit != null and house.unit != ''">and jh.unit = #{house.unit}</if>
<if test="house.room != null and house.room != ''">and jh.room = #{house.room}</if>
<if test="house.buildingNo != null ">and jh.building_no = #{house.buildingNo}</if>
- <if test="house.regionCode != null and house.regionCode !='' ">
- and jg.community_code like concat('%',#{house.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
<if test="house.parentId != null ">
and jh.house_code in (
@@ -194,7 +206,7 @@
</if>
and jh.is_deleted = 0
ORDER BY
- jh.update_time DESC
+ jh.update_time desc,jh.id desc
</where>
@@ -235,11 +247,10 @@
select
jh.*,
jhl.id as cid,jhl.*,jhl.remark as cremark,
- br.code as neiCode,jg.id as gridId,br.town_code as streetCode
+ br.code as neiCode,br.town_code as streetCode
from jczz_house jh
left join jczz_user_house_label jhl on jh.house_code = jhl.house_code and jhl.lable_type = 2
- left join jczz_grid_range jgr on jgr.house_code = jh.house_code
- left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
where jh.is_deleted = 0
<if test="house.houseCode!=null and house.houseCode!=''">
@@ -382,7 +393,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -436,7 +447,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
@@ -486,7 +497,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
</select>
@@ -537,7 +548,7 @@
jczz_doorplate_address jda
LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
WHERE
- jc.res_police_user_id = #{userId})
+ jc.res_police_user_id like concat('%',#{userId},'%'))
)
</if>
) a
--
Gitblit v1.9.3