From 7077d3a7819de3229482e5a9edb4bd895ea2a49f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 29 Oct 2025 16:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
index 2b0a1b3..fcd9df0 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
@@ -6,14 +6,13 @@
import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
-import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
-import com.ard.route.domain.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteFile;
import com.ard.route.mapper.ArdRouteFileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFolderMapper;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
import org.springframework.transaction.annotation.Transactional;
@@ -105,12 +104,8 @@
@Transactional(rollbackFor = Exception.class)
public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
Map<String, Integer> result = new HashMap<>();
- int fileAdd = 0;
// 删除文件夹的同时也删除文件夹下的所有文件
- for (String folderId : ids) {
- ardRouteFileMapper.deleteArdRouteFileByFolderId(folderId);
- fileAdd ++;
- }
+ int fileAdd = ardRouteFileMapper.deleteRouteFileByFolderIds(ids);
result.put("file", fileAdd);
int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
result.put("folder", folderCount);
--
Gitblit v1.9.3