diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 8ad9c87a..fc0bf3cb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -304,7 +304,7 @@ public class DQBomService { public void deleteBom(Long rowId) { BomNewDQbomParentEntity root = dQBomParentService.getById(rowId); VUtils.isTure(Objects.isNull(root)).throwMessage("bom不存在"); - VUtils.isTure(!SessionUtil.getUserCode().equals(root.getCreatedBy())).throwMessage("不能删除他人创建的bom"); + // VUtils.isTure(!SessionUtil.getUserCode().equals(root.getCreatedBy())).throwMessage("不能删除他人创建的bom"); VUtils.isTure(root.getStatus().equals(DQBomStatusEnum.PUBLISHED.getValue())).throwMessage("不能删除已发布的bom"); Set liChildren = new HashSet<>(); @@ -314,8 +314,12 @@ public class DQBomService { children.forEach(c -> { delete(liParents, liChildren, c); }); - dQBomParentService.getBaseMapper().deleteBatchIds(liParents); - dQBomChildService.getBaseMapper().deleteBatchIds(liChildren); + if (CollUtil.isNotEmpty(liParents)) { + dQBomParentService.getBaseMapper().deleteBatchIds(liParents); + } + if (CollUtil.isNotEmpty(liChildren)) { + dQBomChildService.getBaseMapper().deleteBatchIds(liChildren); + } } private void delete(Set parents, Set children, BomNewDQbomVO bom) {