From 69dfdfd0a0bc16f5f4f51d94596a21fc489e5110 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 4 Sep 2023 11:29:57 +0800
Subject: [PATCH] updates

---
 .../ocr/service/impl/OcrIdentifyServiceImpl.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index 23d6759..5792396 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -401,8 +401,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
         ocrIdentifyCallbackLogService.save(ocrIdentifyCallbackLog);
         if (b) {
             updateWrapper.set(OcrIdentify::getNoticeStatus,"1");
+            update(updateWrapper);
         }
-        update(updateWrapper);
     }
 
     @Override
@@ -825,8 +825,16 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
             //long count = ocrResultDTOList.stream().filter(o -> !o.getRuleValidation()).count();
             responseBody.put("taskResult",count>0?0:1);//匹配成功或失败
             List<String> haveRateTagList = ocrResultDTOList.stream().filter(o -> o.getTextRate() > 0).map(OcrResultDTO::getTag).collect(Collectors.toList());
+            List<OcrResultDTO> newResultDTOList=new ArrayList<>();
             //过滤掉0的值
-            ocrResultDTOList = ocrResultDTOList.stream().filter(o->haveRateTagList.contains(o.getTag()) && o.getTextRate()>0).collect(Collectors.toList());
+            for (OcrResultDTO o : ocrResultDTOList) {
+                if (haveRateTagList.contains(o.getTag())) {
+                    newResultDTOList.addAll(ocrResultDTOList.stream().filter(oo -> o.getTag().equals(oo.getTag()) && o.getTextRate() > 0).collect(Collectors.toList()));
+                }else{
+                    newResultDTOList.add(o);
+                }
+            }
+            ocrResultDTOList = newResultDTOList;
         }
         //获取最小
         double min = 0d;