From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index f5e9121..d2d3f79 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -13,10 +13,39 @@
<!--自定义分页查询-->
<select id="selectPlacePage" resultType="org.springblade.modules.place.vo.PlaceVO">
- select jp.*,bu.real_name as username,bu.phone as phone from jczz_place jp
+ select
+ jp.*,
+ bu.real_name as username,bu.phone as phone,
+ bx.real_name as createUserName
+ from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
- left join jczz_place_poi_label jppl on jppl.place_id = jp.id
+ left join blade_user bx on bx.id = jp.create_user and bx.is_deleted = 0
+ left join (
+ select a.* from jczz_place_poi_label a inner join
+ (
+ select place_id,max(id) as id from jczz_place_poi_label b group by place_id
+ ) b on a.id = b.id
+ ) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0
+ <if test="place.roleName!=null and place.roleName!=''">
+ <choose>
+ <when test="place.roleName=='网格员'">
+ and
+ (
+ jp.create_user = #{place.createUser}
+ <if test="houseCodeList != null and houseCodeList.size()>0">
+ or jp.house_code in
+ <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
+ </if>
+ )
+ </when>
+ <otherwise>
+ and jp.principal_user_id = #{place.createUser}
+ </otherwise>
+ </choose>
+ </if>
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
</if>
@@ -41,9 +70,17 @@
<!--查询场所集合信息-->
<select id="selectPlaceNodeList" resultType="org.springblade.common.node.TreeNode" >
- select id,place_name as name,false as hasChildren from jczz_place
- where 1=1 and is_deleted = 0
- and principal_user_id = #{userId}
+ select jp.id,
+ jp.house_code houseCode,
+ jp.place_name as name,
+ jda.doorplate_type doorplateType,
+ jda.address_level addressLevel,
+ false as hasChildren
+ from jczz_place jp
+ left join jczz_doorplate_address jda on jp.house_code = jda.address_code
+ where 1 = 1
+ and jp.is_deleted = 0
+ and jp.principal_user_id = #{userId}
</select>
--
Gitblit v1.9.3