diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java index f4a97052..7f8f85c4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java @@ -265,9 +265,22 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl ids, Boolean isValid) { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 + for (Long id : ids) { + BusFormalitiesAreConsolidated selected = baseMapper.selectById(id); + if (selected == null || !FormalitiesStatusEnum.TOSTART.getText().equals(selected.getProcessingStatus())) { + throw new ServiceException("只能删除待开始数据"); + } + Long count = busFormalitiesAnnexService.getBaseMapper().selectCount(new LambdaQueryWrapper() + .eq(BusFormalitiesAnnex::getFormalitiesId, id)); + if (count > 0L) { + busFormalitiesAnnexService.getBaseMapper().delete(new LambdaQueryWrapper() + .eq(BusFormalitiesAnnex::getFormalitiesId, id)); + } + } } return baseMapper.deleteByIds(ids) > 0; }