处理培训/演练删除计划时错误删除历史已完成任务数据

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

@@ -513,12 +513,12 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             removeById(id);
             return;
         }
-        Integer isExecute = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
+        int isExecute = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
                         .in(CoreDrillTask::getPlanId, list)
                         .eq(CoreDrillTask::getStatus, DrillDoStatus.DONE.getCode()))
                 .intValue();
         list.add(id);
-        if (ObjectUtil.notEqual(isExecute, 1)) {
+        if (isExecute < 1) {
             // 计划下没有已完成：删除所有任务,计划数据做物理删除。
             coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, null, null);
             coreDrillPlanMapper.delByIds(list);

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

@@ -498,12 +498,12 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             removeById(id);
             return;
         }
-        Integer isExecute = coreEduTrainingTaskMapper.selectCount(new LambdaQueryWrapper<CoreEduTrainingTask>()
+        int isExecute = coreEduTrainingTaskMapper.selectCount(new LambdaQueryWrapper<CoreEduTrainingTask>()
                         .in(CoreEduTrainingTask::getPlanId, list)
                         .eq(CoreEduTrainingTask::getStatus, EduTrainingDoStatus.DONE.getCode()))
                 .intValue();
         list.add(id);
-        if (ObjectUtil.notEqual(isExecute, 1)) {
+        if (isExecute < 1) {
             // 计划下没有已完成：删除所有任务,计划数据做物理删除。
             coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, null, null);
             coreEduTrainingPlanMapper.delByIds(list);