From a4741ec93e32f77380859e173d8022083d8ced4f Mon Sep 17 00:00:00 2001
From: yangwei <867012372@qq.com>
Date: Mon, 9 Jun 2025 16:09:17 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E6=8F=90=E4=BA=A4=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E9=97=A8=E5=8C=BA=E5=9F=9F=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E2=91=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/domain/SysDepartBoundary.java     | 4 ++++
 .../service/impl/SysDepartBoundaryServiceImpl.java       | 9 ++++++++-
 .../java/org/dromara/system/utils/KmlParserUtil.java     | 2 +-
 .../resources/mapper/system/SysDepartBoundaryMapper.xml  | 7 +++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/SysDepartBoundary.java b/dk-modules/system/src/main/java/org/dromara/system/domain/SysDepartBoundary.java
index c1abc95..e2b96d9 100644
--- a/dk-modules/system/src/main/java/org/dromara/system/domain/SysDepartBoundary.java
+++ b/dk-modules/system/src/main/java/org/dromara/system/domain/SysDepartBoundary.java
@@ -1,6 +1,7 @@
 package org.dromara.system.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -50,4 +51,7 @@ public class SysDepartBoundary extends BaseEntity {
 	/**删除状态（0，正常，1已删除）*/
 	private String delFlag;
 
+    @TableField(exist = false)
+    private List<Long> deptIds;
+
 }
diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDepartBoundaryServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDepartBoundaryServiceImpl.java
index c569c5d..4256e16 100644
--- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDepartBoundaryServiceImpl.java
+++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDepartBoundaryServiceImpl.java
@@ -51,6 +51,13 @@ public class SysDepartBoundaryServiceImpl extends ServiceImpl<SysDepartBoundaryM
 
     @Override
     public TableDataInfo<SysDepartBoundary> listSysDepartBoundary(PageQuery pageQuery, SysDepartBoundary departBoundary) {
+        if (ObjectUtil.isNotEmpty(departBoundary.getDeptId())){
+            List<SysDeptVo> deptList = deptService.listTreeDept(departBoundary.getDeptId());
+
+            departBoundary.setDeptIds(deptList.stream().map(SysDeptVo::getDeptId).distinct().toList());
+        }
+
+
         Page<SysDepartBoundary> page = baseMapper.listSysDepartBoundary(pageQuery.build(),departBoundary);
 
         return TableDataInfo.build(page);
@@ -120,7 +127,7 @@ public class SysDepartBoundaryServiceImpl extends ServiceImpl<SysDepartBoundaryM
                     if (ObjectUtil.isNotEmpty(attributes)) {
                         map.putAll(attributes);
                     }
-                    map.put("XZQMC", kmzResult.getName());
+                    map.put("O_NAME", kmzResult.getName());
                     map.put("the_geom", kmzResult.getWkt());
                     kmzList.add(map);
                 });
diff --git a/dk-modules/system/src/main/java/org/dromara/system/utils/KmlParserUtil.java b/dk-modules/system/src/main/java/org/dromara/system/utils/KmlParserUtil.java
index b1a8767..4cea698 100644
--- a/dk-modules/system/src/main/java/org/dromara/system/utils/KmlParserUtil.java
+++ b/dk-modules/system/src/main/java/org/dromara/system/utils/KmlParserUtil.java
@@ -68,7 +68,7 @@ public class KmlParserUtil {
 
             // 创建Map并添加到列表
             Map<String, String> placemarkMap = new HashMap<>();
-            placemarkMap.put("XZQMC", name);
+            placemarkMap.put("O_NAME", name);
 
             String wkt = convertToWKT(coordinates);
 
diff --git a/dk-modules/system/src/main/resources/mapper/system/SysDepartBoundaryMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysDepartBoundaryMapper.xml
index c4cb403..185d183 100644
--- a/dk-modules/system/src/main/resources/mapper/system/SysDepartBoundaryMapper.xml
+++ b/dk-modules/system/src/main/resources/mapper/system/SysDepartBoundaryMapper.xml
@@ -49,6 +49,13 @@
             <if test="condition.deptName != null and condition.deptName != ''">
                 and t.dept_name like  concat(concat('%',#{condition.deptName}),'%')
             </if>
+
+            <if test="condition.deptIds != null and condition.deptIds.size > 0">
+                and t.dept_id in
+                <foreach collection="condition.deptIds" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>