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 ids; + @ApiModelProperty("父分区ID列表") + private List 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 selectIdByQuery(@Param("query") PartQuery query); - List selectChildren(PartVO partVO); + List selectChildren(List 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" and picture = #{query.picture} and bs.store_name like concat('%', #{query.storeName}, '%') and bp_parent.part_name like concat('%', #{query.parentName}, '%') + + and bp.parent_id in + + #{ids} + + ${@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 partIds) { + PartQuery query = new PartQuery(); + query.setParentIds(partIds); + List list = partMapper.selectPartList(query); + ServiceUtil.assertion(!list.isEmpty(),"当前区域有子分区,不允许删除"); return partMapper.deletePartByPartIds(partIds); }