From f61dc2d33639010a7b9505fad0cfbe9d36e1f83b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 九月 2024 11:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
index 5e45ff9..dc0a2fb 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/ProjectServiceImpl.java
@@ -137,16 +137,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String id) {
-
- //删除
- baseDao.deleteById(id);
-
- //删除模型关联
+ //删除备份文件
Map<String,Object> map = new HashMap<>();
map.put("projectId",id);
- projectModelService.deleteByMap(map);
-
- //删除备份文件
List<ProjectPackageHistoryDTO> list = projectPackageHistoryService.list(map);
list.forEach(e -> {
File file = new File(e.getFilePath());
@@ -156,11 +149,17 @@
}
});
+ //删除 (级联删除)
+ baseDao.deleteById(id);
+
+ //删除模型关联
+// projectModelService.deleteByMap(map);
+
//删除打包历史
- projectPackageHistoryService.deleteByMap(map);
+// projectPackageHistoryService.deleteByMap(map);
//删除打包历史模型关联
- projectPackageHistoryModelService.deleteByMap(map);
+// projectPackageHistoryModelService.deleteByMap(map);
}
@Override
--
Gitblit v1.9.3