Commit 98fdcee1 authored by zhoushiguang's avatar zhoushiguang

Merge remote-tracking branch 'origin/master'

parents 29135069 06972920
......@@ -208,6 +208,9 @@ public class StrategyPriorityServiceImpl extends ServiceImpl<StrategyPriorityMap
// 当全部删除时,1.校验日计划中是否有使用;2.并且删除数量=数据库中数量
List<StrategyPriorityConfig> data4DB = strategyPriorityMapper.selectCrossGroupStrategyPriorityList(crossId, greenId, groupId);
List<StrategyPriorityDailyInfo> dailyInfos = strategyPriorityMapper.selectCrossGreenGroupDailyPlanList(crossId, greenId, groupId);
if (CollectionUtils.isEmpty(data4DB)) {
return;
}
if (CollectionUtils.isNotEmpty(dailyInfos) && data4DB.size() <= dataList.size()) {
throw new RuntimeException("日计划中已使用当前分组: " + groupId + " 不能清空!");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment