From fc3c4866fe4c930a876aed86b87e493df25fac69 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Tue, 5 Sep 2023 17:27:21 +0800
Subject: [PATCH] updates

---
 .../impl/OcrMetadataConfigServiceImpl.java    | 33 +++++++++++--------
 .../service/impl/OcrRuleCheckServiceImpl.java |  1 -
 2 files changed, 19 insertions(+), 15 deletions(-)

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<OcrMetadataConfigM
 
     @Override
     public boolean copy(OcrMetadataConfig ocrMetadataConfig) {
-        String id = ocrMetadataConfig.getId();
-        OcrMetadataConfig metadataConfig = this.getById(id);
-        LambdaQueryWrapper<OcrMetadataConfig> 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<OcrMetadataConfigDetail> list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper<OcrMetadataConfigDetail>().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<OcrMetadataConfig> 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<OcrMetadataConfigDetail> list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper<OcrMetadataConfigDetail>().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<OcrRuleCheckMapper, Ocr
         ocrRuleCheck.setMetadataConfigId(saveOcrRuleCheckVO.getMetadataConfigId());
         ocrRuleCheck.setConfigName(saveOcrRuleCheckVO.getConfigName());
         this.updateById(ocrRuleCheck);
-
         //明细
         /*List<OcrRuleCheckDetail> ocrRuleCheckDetailList=new ArrayList<>();
         List<String> ocrRuleCheckDetailIdList=new ArrayList<>();