From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 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 d34ab7d..4b69ba0 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -34,24 +34,11 @@
) b on a.id = b.id
) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jp.source!=3
- <if test="place.roleName!=null and place.roleName!='' and place.createUser!=null">
- <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 test="houseCodeList != null and houseCodeList.size()>0">
+ and jp.house_code in
+ <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
+ #{houseCode}
+ </foreach>
</if>
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
@@ -78,21 +65,10 @@
and jp.source = #{place.source}
</if>
<if test="place.isPerfect==1">
- and
- (
- jp.place_name is null
- or jp.image_urls is null
- or jppl.poi_code is null
- or bu.real_name is null
- or bu.phone is null
- )
+ and jpe.confirm_flag = 4
</if>
<if test="place.isPerfect==2">
- and jp.place_name != ""
- and jp.image_urls != ""
- and jppl.poi_code is not null
- and bu.real_name != ""
- and bu.phone != ""
+ and jpe.confirm_flag >= 1 and jpe.confirm_flag < 4
</if>
<if test="place.regionCode != null and place.regionCode !='' ">
and jg.community_code like concat('%',#{place.regionCode},'%')
--
Gitblit v1.9.3