From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并,网格员区域树查询修改,解决不显示网格问题

---
 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index baeeace..9528bdf 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -71,7 +71,7 @@
         aoi_code aoiCode
         from jczz_district
         where is_deleted = 0
-        <if test="district.districtIdList!=null and district.districtIdList!=''">
+        <if test="district.districtIdList!=null and district.districtIdList.size() > 0">
             and id in
             <foreach collection="district.districtIdList" item="item" separator ="," open="("  close=")">
                 #{item}
@@ -82,13 +82,19 @@
 
     <!--小区自定义获取详情查询-->
     <select id="getDetail" resultType="org.springblade.modules.district.vo.DistrictVO">
-        SELECT
-        jd.*,
-        jda.nei_code as communityCode,jda.nei_name as communityName
+        SELECT jd.*,
+               jda.nei_code as communityCode,
+               jda.nei_name as communityName,
+               jpo.organization_name,
+               jpo.organization_type,
+               jpo.branch_type,
+               jpo.charge_person,
+               jpo.phone
         FROM jczz_district jd
-        left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
+                 left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
+                 LEFT JOIN jczz_party_organization jpo on jpo.area_id = jda.nei_code
         where jd.is_deleted = 0
-        and jda.address_code = #{district.houseCode}
+          and jda.address_code = #{district.houseCode}
     </select>
 
 

--
Gitblit v1.9.3