Merge remote-tracking branch 'origin/test' into test

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java

@@ -190,16 +190,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
             //阈值分组map
             Map<String,Integer> similarityGroupOrderMap = new HashMap<>();
             //1.开启比对任务
-            boolean isCompleteSimilarGroupIdNull;
             for (OcrPicture ocrPicture : ocrPictureList) {
 
                 // 添加相似度百分百分组id
                 if (ObjectUtils.isEmpty(ocrPicture.getCompleteSimilarGroupId())) {
                     ocrPicture.setCompleteSimilarGroupId(SnowFlakeUtil.nextId());
                     pictureService.updateById(ocrPicture);
-                    isCompleteSimilarGroupIdNull = true;
-                } else {
-                    isCompleteSimilarGroupIdNull = false;
                 }
                 logService.addLog(103, "AI获取图片相似度接口", sysUser, "sendParams");
                 if (org.apache.commons.lang3.StringUtils.isBlank(ocrPicture.getImgHash())) {
@@ -295,7 +291,7 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
                             ocrPictureNext.setCompleteSimilarGroupId(ocrPicture.getCompleteSimilarGroupId());
                             pictureService.updateById(ocrPictureNext);
                         } else {
-                            if (!ocrPictureNext.getCompleteSimilarGroupId().equals(ocrPicture.getCompleteSimilarGroupId()) && isCompleteSimilarGroupIdNull) {
+                            if (!ocrPictureNext.getCompleteSimilarGroupId().equals(ocrPicture.getCompleteSimilarGroupId())) {
                                 ocrPicture.setCompleteSimilarGroupId(ocrPictureNext.getCompleteSimilarGroupId());
                                 pictureService.updateById(ocrPicture);
                             }