fix: 解决任务审核报错

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

@@ -683,9 +683,21 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
             JSONObject jsonObject = JSONObject.parseObject(duplicateHis.getCheckDuplicateResultHisJson());
             Set<String> pictureIds = jsonObject.keySet();
-            List<OcrTaskChildPictureVo> taskChildPictures = this.getPictureHistoryList(new ArrayList<>(pictureIds), userNodeType);
+            List<OcrTaskChildPictureVo> taskChildPicturesOld = this.getPictureHistoryList(new ArrayList<>(pictureIds), userNodeType);
+            List<OcrTaskChildPictureVo> taskChildPictures = new ArrayList<>();
+            for (OcrTaskChildPictureVo taskChildPicture : taskChildPicturesOld) {
+                if(taskChildPicture.getPictureId()!=null){
+                    taskChildPictures.add(taskChildPicture);
+                }
+            }
+
             for (OcrTaskChildPictureVo taskChildPicture : taskChildPictures) {
-                taskChildPicture.setSimilarityScore(Integer.parseInt(jsonObject.getString(taskChildPicture.getPictureId().toString())));
+                if(jsonObject.getString(taskChildPicture.getPictureId())!=null){
+                    taskChildPicture.setSimilarityScore(Integer.parseInt(jsonObject.getString(taskChildPicture.getPictureId().toString())));
+                }else{
+                    taskChildPicture.setSimilarityScore(1);
+                }
+
             }
             if (orderValue.equals("similarityScore")) {
                 if ("desc".equals(orderType)) {