From c55696bd670be71757e48c584d978cc6059fd103 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 Jan 2024 17:10:34 +0800
Subject: [PATCH] 场所维护，场所查询修改
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 45dab58..7c9a6c5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -24,11 +24,13 @@
WHERE
jpe.is_deleted = 0
<if test="placeExt.communityCode != null and placeExt.communityCode != ''">
- and jg.community_code=#{placeExt.communityCode}
+ and jg.community_code like concat('%',#{placeExt.communityCode},'%')
</if>
-
<if test="placeExt.placeName != null and placeExt.placeName != ''">
and jp.place_name like concat('%',#{placeExt.placeName},'%')
+ </if>
+ <if test="placeExt.placeId != null">
+ and jp.id = #{placeExt.placeId}
</if>
<if test="placeExt.houseCode != null and placeExt.houseCode != ''">
and jp.house_code = #{placeExt.houseCode}
@@ -39,24 +41,11 @@
<if test="placeExt.startTime != null and placeExt.startTime != '' and placeExt.endTime != null and placeExt.endTime != '' ">
AND jpe.create_time BETWEEN #{placeExt.startTime} and #{placeExt.endTime}
</if>
- <if test="placeExt.roleName!=null and placeExt.roleName!='' and placeExt.createUser!=null">
- <choose>
- <when test="placeExt.roleName=='网格员'">
- and
- (
- jp.create_user = #{placeExt.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 = #{placeExt.createUser}
- </otherwise>
- </choose>
+ <if test="houseCodeList != null and houseCodeList.size()>0">
+ and jp.house_code in
+ <foreach collection="houseCodeList" item="houseCode" separator="," open="(" close=")">
+ #{houseCode}
+ </foreach>
</if>
order by jpe.create_time desc,jpe.id desc
</select>
--
Gitblit v1.9.3