From 7bbf08d2a38d91bf4a1cf278c52ff7303e05fdaf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 18:11:06 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 bc86f44..2f7bb9a 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -22,6 +22,25 @@
) 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>
@@ -46,9 +65,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