diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java index 5567d804e..32e35c01d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/enums/ManifestStateEnum.java @@ -12,6 +12,7 @@ import java.util.Map; */ public enum ManifestStateEnum { COLLECTING("收集中","Collecting","收集中"), + UNCOLLECTED("未收集","Uncollected","未收集"), FINISHED("已完成","Finished","已完成"); String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7a7b52f5c..02d078e02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2356,6 +2356,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = paramsCollectManifestEOService.isCollectFinished(id); - Boolean finish = (Boolean) map.get("finish"); - if (!finish) { - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("清单收集中,无法删除!"); - } else { - throw new JeroBootException("Manifest collection, and cannot be deleted!"); + ParamsManifestEO paramsManifestEO = this.paramsManifestEOMapper.selectById(id); + // 如果该清单状态不是未收集,按照之前的逻辑判断是否能删除,如果是未收集 可以直接删 + if(!StringUtils.equals(ManifestStateEnum.UNCOLLECTED.getValue(),paramsManifestEO.getState())){ + // 判断清单收集状态,已完成状态才可删除 + Map map = paramsCollectManifestEOService.isCollectFinished(id); + Boolean finish = (Boolean) map.get("finish"); + if (!finish) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("清单收集中,无法删除!"); + } else { + throw new JeroBootException("Manifest collection, and cannot be deleted!"); + } } } + // 关联删除配置 LambdaQueryWrapper configEOQueryWrapper = new LambdaQueryWrapper<>(); configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id); @@ -269,15 +274,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl ids, String cut) { // 判断清单收集状态,已完成状态才可删除 ids.forEach(id-> { - Map map = paramsCollectManifestEOService.isCollectFinished(id); - Boolean finish = (Boolean) map.get("finish"); - if (!finish) { - ParamsManifestEO manifestEO = getById(id); + ParamsManifestEO paramsManifestEO = this.paramsManifestEOMapper.selectById(id); + if(paramsManifestEO != null){ + // 如果该清单状态不是未收集,按照之前的逻辑判断是否能删除,如果是未收集 可以直接删 + if(!StringUtils.equals(ManifestStateEnum.UNCOLLECTED.getValue(),paramsManifestEO.getState())){ + Map map = paramsCollectManifestEOService.isCollectFinished(id); + Boolean finish = (Boolean) map.get("finish"); + if (!finish) { + ParamsManifestEO manifestEO = getById(id); - if (CutEnum.CN.getValue().equals(cut)) { - throw new JeroBootException("清单:" + manifestEO.getTitle() + "收集中,无法删除!"); - } else { - throw new JeroBootException("Manifest " + manifestEO.getTitle() + "collection, and cannot be deleted!"); + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("清单:" + manifestEO.getTitle() + "收集中,无法删除!"); + } else { + throw new JeroBootException("Manifest " + manifestEO.getTitle() + "collection, and cannot be deleted!"); + } + } } } }); @@ -729,7 +740,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl 0) { let _this = this @@ -408,6 +408,7 @@ _this.getlist() } else { _this.$message.warning(_this.$t('operationFailed')) + this.selectedRowKeys = [] } }) } @@ -432,6 +433,7 @@ this.getlist() }, getlist() { + this.selectedRowKeys = [] let query = { projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id, pageSize: this.pageSize,