diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaDeliveryOrderServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaDeliveryOrderServiceImpl.java index e025519..153affe 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaDeliveryOrderServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaDeliveryOrderServiceImpl.java @@ -155,10 +155,20 @@ public class OaDeliveryOrderServiceImpl implements IOaDeliveryOrderService { * 批量删除送货单主 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } + + // 先删除明细表记录 + if (ids != null && !ids.isEmpty()) { + LambdaQueryWrapper detailWrapper = Wrappers.lambdaQuery(); + detailWrapper.in(OaDeliveryOrderDetail::getOrderId, ids); + detailMapper.delete(detailWrapper); + } + + // 再删除主表记录 return baseMapper.deleteBatchIds(ids) > 0; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProcessCardServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProcessCardServiceImpl.java index 548d5fe..b322885 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProcessCardServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProcessCardServiceImpl.java @@ -139,6 +139,10 @@ public class OaProcessCardServiceImpl implements IOaProcessCardService { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } + // 先删除明细表数据 先判断 + if (ids != null && !ids.isEmpty()) { + oaProcessCardDetailMapper.delete(Wrappers.lambdaQuery().in(OaProcessCardDetail::getCardId, ids)); + } return baseMapper.deleteBatchIds(ids) > 0; }