教育、演练 机构类型为行社时 草稿状态再编辑 计划会被删除

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -426,8 +426,12 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
 
         List<Long> longs = baseMapper.selectAllIdByParentId(plan.getId());
         if (!longs.isEmpty()) {
-            physicalDeleteMapper.deletedDrillPlanByIds(longs);
-            coreDrillPlanToExecOrgService.deleteByPlanIds(longs);
+            longs.remove(plan.getId());
+            if(!longs.isEmpty()){
+                baseMapper.delByIds(longs);
+            }
+//            physicalDeleteMapper.deletedDrillPlanByIds(longs);
+//            coreDrillPlanToExecOrgService.deleteByPlanIds(longs);
         }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -393,8 +393,12 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
 
         List<Long> longs = baseMapper.selectAllIdByParentId(plan.getId());
         if (!longs.isEmpty()) {
-            physicalDeleteMapper.deletedEduPlanByIds(longs);
-            coreEduTrainingPlanToExecOrgService.deleteByPlanIds(longs);
+            longs.remove(plan.getId());
+            if(!longs.isEmpty()){
+                baseMapper.delByIds(longs);
+            }
+//            physicalDeleteMapper.deletedEduPlanByIds(longs);
+//            coreEduTrainingPlanToExecOrgService.deleteByPlanIds(longs);
         }