From 47e879bd1904ac6fcda169130a3d25f78b85ab19 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Tue, 20 May 2025 13:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=BA=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/bst/part/domain/PartQuery.java  | 3 +++
 .../src/main/java/com/ruoyi/bst/part/mapper/PartMapper.java | 2 +-
 .../src/main/java/com/ruoyi/bst/part/mapper/PartMapper.xml  | 6 ++++++
 .../com/ruoyi/bst/part/service/impl/PartServiceImpl.java    | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/part/domain/PartQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/part/domain/PartQuery.java
index 826b07b..0455398 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/part/domain/PartQuery.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/part/domain/PartQuery.java
@@ -12,4 +12,7 @@ public class PartQuery extends PartVO {
     @ApiModelProperty("分区ID列表")
     private List<Long> ids;
 
+    @ApiModelProperty("父分区ID列表")
+    private List<Long> parentIds;
+
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.java
index 64d6a2e..5b22e75 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.java
@@ -74,5 +74,5 @@ public interface PartMapper
 
     public List<Long> selectIdByQuery(@Param("query") PartQuery query);
 
-    List<PartVO> selectChildren(PartVO partVO);
+    List<PartVO> selectChildren(List<Long> ids);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.xml
index 04e5e60..4d5d574 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/part/mapper/PartMapper.xml
@@ -44,6 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.picture != null  and query.picture != ''"> and picture = #{query.picture}</if>
         <if test="query.storeName != null  and query.storeName != ''"> and bs.store_name like concat('%', #{query.storeName}, '%') </if>
         <if test="query.parentName != null  and query.parentName != ''"> and bp_parent.part_name like concat('%', #{query.parentName}, '%') </if>
+        <if test="query.parentIds != null and query.parentIds.size() > 0">
+            and bp.parent_id in
+            <foreach collection="query.parentIds" item="ids" open="(" separator="," close=")">
+                #{ids}
+            </foreach>
+        </if>
         ${@com.ruoyi.framework.util.DataScopeUtil@create(query.scope)
         .userSetAlias("bs.user_id")
         .storeAlias("bp.store_id",query.storePermissions)
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/part/service/impl/PartServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/part/service/impl/PartServiceImpl.java
index ab71231..b3b0dad 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/part/service/impl/PartServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/part/service/impl/PartServiceImpl.java
@@ -114,6 +114,10 @@ public class PartServiceImpl implements PartService
     @Override
     public int deletePartByPartIds(List<Long> partIds)
     {
+        PartQuery query = new PartQuery();
+        query.setParentIds(partIds);
+        List<PartVO> list = partMapper.selectPartList(query);
+        ServiceUtil.assertion(!list.isEmpty(),"当前区域有子分区,不允许删除");
         return partMapper.deletePartByPartIds(partIds);
     }