From 3a5ea5a84c338e0cb7a942e03a98e883a0b23115 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 07 Feb 2024 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 101b1c1..7da6da5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -103,17 +103,15 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
bus.phone AS policePhone,
- jda.address_name,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
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_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
@@ -149,6 +147,10 @@
<if test="place.nineType!=null and place.nineType!=''">
and jp.nine_type = #{place.nineType}
+ </if>
+
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -431,17 +433,15 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
bus.phone AS policePhone,
- jda.address_name,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
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_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
@@ -468,7 +468,7 @@
and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.deptName!=null and place.deptName!=''">
- and bd.dept_name like concat('%',#{place.deptName},'%')
+ and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
<if test="place.policeName!=null and place.policeName!=''">
@@ -479,6 +479,10 @@
and jp.nine_type = #{place.nineType}
</if>
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
+ </if>
+
<if test="place.neiName!=null and place.neiName!=''">
and br.name like concat('%',#{place.neiName},'%')
</if>
--
Gitblit v1.9.3