diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java index 5ce250d..a1553aa 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java @@ -96,21 +96,26 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(OcrMetadataConfig::getConfigName,metadataConfig.getConfigName()); - long count = this.count(queryWrapper); - metadataConfig.setId(null); - metadataConfig.setConfigName(metadataConfig.getConfigName()+"("+(count+1)+")"); - this.save(metadataConfig); - List list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper().eq(OcrMetadataConfigDetail::getMetadataConfigId, id)); - if (CollectionUtils.isNotEmpty(list)) { - for (OcrMetadataConfigDetail ocrMetadataConfigDetail : list) { - ocrMetadataConfigDetail.setId(null); - ocrMetadataConfigDetail.setMetadataConfigId(metadataConfig.getId()); + String ids = ocrMetadataConfig.getId(); + if (StringUtils.isBlank(ids)) { + return false; + } + for (String id : ids.split(",")) { + OcrMetadataConfig metadataConfig = this.getById(id); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(OcrMetadataConfig::getConfigName,metadataConfig.getConfigName()); + long count = this.count(queryWrapper); + metadataConfig.setId(null); + metadataConfig.setConfigName(metadataConfig.getConfigName()+"("+(count+1)+")"); + this.save(metadataConfig); + List list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper().eq(OcrMetadataConfigDetail::getMetadataConfigId, id)); + if (CollectionUtils.isNotEmpty(list)) { + for (OcrMetadataConfigDetail ocrMetadataConfigDetail : list) { + ocrMetadataConfigDetail.setId(null); + ocrMetadataConfigDetail.setMetadataConfigId(metadataConfig.getId()); + } + ocrMetadataConfigDetailService.saveBatch(list); } - ocrMetadataConfigDetailService.saveBatch(list); } return true; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java index c749be6..98cd3e7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrRuleCheckServiceImpl.java @@ -109,7 +109,6 @@ public class OcrRuleCheckServiceImpl extends ServiceImpl ocrRuleCheckDetailList=new ArrayList<>(); List ocrRuleCheckDetailIdList=new ArrayList<>();