diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index e55b901f..11f9c91a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -93,16 +93,16 @@ public class MarketStandardController { * @param map * @return */ - @AutoLog(value = "外部标准库-市场法规清单-批量删除") - @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除") + @AutoLog(value = "外部标准库-市场法规清单-删除") + @ApiOperation(value = "外部标准库-市场法规清单-删除", notes = "外部标准库-市场法规清单-删除") @ApiOperationSupport(order = 4) @PostMapping(value = "/delete") - @RequiresPermissions("marketStandard:delete") + @RequiresPermissions("marketStandard:deleteBatch") public Result delete(@RequestBody Map map) { if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { return Result.error("请选择数据!"); } - this.marketStandardService.deleteById(Arrays.asList(map.get("id").split(","))); + this.marketStandardService.deleteById(map.get("id")); return Result.OK("批量删除成功!"); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 449288fb..8cb8631b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -23,7 +23,7 @@ public interface ILawsMarketStandardService extends IService * 删除 * @param ids */ - void deleteById(List ids); + void deleteById(String id); /** * 批量删除 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 36165368..4177d3e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -224,14 +224,28 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl ids) { + public void deleteById(String id) { + LawsMarketStandard lawsMarketStandard = getById(id); + if(Objects.isNull(lawsMarketStandard)){ + throw new JeroBootException("数据不存在"); + } + // 获取不同版本的数据 LambdaQueryWrapper queryLawsMarketStandard = new LambdaQueryWrapper<>(); -// list() - removeByIds(ids); + queryLawsMarketStandard.select(LawsMarketStandard::getId); + queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag()); + List listLawsMarketStandard = list(queryLawsMarketStandard); + if(CollectionUtils.isEmpty(listLawsMarketStandard)){ + throw new JeroBootException("数据不存在"); + } + // 删除版本标识下所有数据 + LambdaUpdateWrapper updateLawsMarketStandard = new LambdaUpdateWrapper<>(); + updateLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag()); + remove(updateLawsMarketStandard); + // 删除详情列表数据 + List listIds = listLawsMarketStandard.stream().map(LawsMarketStandard::getId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(LawsMarketStandardDetail::getManifestId, ids); + wrapper.in(LawsMarketStandardDetail::getManifestId, listIds); lawsMarketStandardDetailService.remove(wrapper); - } @Override