From b0f0ed0a1cb771c4d1a17e3c8ce90e0cf68cb641 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 03 Feb 2024 16:02:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 51ea714..652d9ad 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -107,7 +107,7 @@
bus.`name` AS policeName,
bu.phone AS policePhone,
jda.address_name,
- bd.dept_name
+ 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
@@ -115,7 +115,7 @@
left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_community jc on jc.`code`=jg.community_code
LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN blade_dept bd on bd.id = bus.dept_id
+ LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
--
Gitblit v1.9.3