diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index c91e9f1e3..5c94ddde5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -283,9 +283,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid); List paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper); - for (ParamsCollectManifestEO peo:paramsCollectManifestEOList) { - peo.setState(CollectManifestStateEnum.WAIT_FILL.getValue()); - } // 根据参数模板id发布版本查询对应参数项集合 List paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version)); @@ -310,6 +307,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl projectLawsInventoryEOListTemp = new ArrayList<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { List collect = projectLawsInventoryEOList.stream() - .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); + .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())&&e.getDutyTerritory().equals(dummyInventoryInfoEO.getDutyTerritory())).collect(Collectors.toList()); if (collect.size() != 0) { for (ProjectLawsInventoryEO lawsInventoryEO : collect) { //数据对比 @@ -3715,7 +3715,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 50 ? text.slice(0, 49) + '...' : text }} - {{$t('edit')}} + {{$t('edit')}} {{record.status && record.status == '1'? $t('withdraw') : $t('release')}} - {{$t('maintenanceTemplate')}} - {{$t('deleteLib')}} + {{$t('deleteLib')}}