培训/演练:处理下发给办事处/省联社 任务父id丢失处理, 统计排行报表增加计划id为空时的处理

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

@@ -653,6 +653,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             planIdList = coreDrillPlanMapper.selectIdByParentId(plan.getId());
             planId = null;
         }
+        if (ObjectUtil.isAllEmpty(planId,planIdList)){
+            return new ArrayList<>();
+        }
         request.setStartTime(DateUtil.beginOfMonth(request.getStartTime()));
         request.setEndTime(DateUtil.endOfMonth(request.getEndTime()));
 

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

@@ -670,7 +670,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             planIdList = coreEduTrainingPlanMapper.selectIdByParentId(plan.getId());
             planId = null;
         }
-
+        if (ObjectUtil.isAllEmpty(planId,planIdList)){
+            return new ArrayList<>();
+        }
         request.setStartTime(DateUtil.beginOfMonth(request.getDate()));
         request.setEndTime(DateUtil.endOfMonth(request.getDate()));