diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java index e49e86a..9bacb9e 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetLabelsServiceImpl.java @@ -109,8 +109,13 @@ public class DataSetLabelsServiceImpl implements DataSetLabelsService try{ Set childIds = new HashSet<>(); for (Long labelId : labelIds){ - childIds.addAll(getFileWithChildren(labelId)); - childIds.add(labelId); + Set childSet = getFileWithChildren(labelId); + if (!childSet.isEmpty()){ + return AjaxResult.error("节点下存在子节点,不能删除"); + } + else { + childIds.add(labelId); + } } // 转换 Set 为 Long[] Long[] longArray = childIds.toArray(new Long[0]); diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetLabelsMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetLabelsMapper.xml index cbdae10..0c7a5b8 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetLabelsMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetLabelsMapper.xml @@ -14,25 +14,28 @@ + - select label_id, ancestors, parent_id, label_name, del_flag, create_by, update_by, update_time, create_time from ai_labels + select a.label_id, a.ancestors, a.parent_id, a.label_name, a.del_flag, a.create_by, a.update_by, a.update_time, a.create_time, b.label_name AS parentName + from ai_labels a + LEFT JOIN ai_labels b ON a.parent_id = b.label_id