From 76a120a10c45bf098391bf8ad4957f9162deecd9 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 17 Mar 2024 20:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/service/impl/OcrTaskchildPictureServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 689aaa4a..61576c51 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
@@ -302,7 +302,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 //		ocrTaskchildPicture.setIzHistory(listPictureids.contains(ocrPicture.getPictureid())?false:true);
 
         //如果当前任务的任务包主键一致，说明不是历史数据，如果不一致，说明是历史数据
-        if (null != packageid && packageid.toString().equals(ocrTaskchildPicture.getPackageid().toString())) {
+        if (null != packageid && null != ocrTaskchildPicture.getPackageid() && packageid.toString().equals(ocrTaskchildPicture.getPackageid().toString())) {
             ocrTaskchildPicture.setIzHistory(false);
         } else {
             ocrTaskchildPicture.setIzHistory(true);
@@ -339,7 +339,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         OcrTaskchildPicture mainOcrTaskchildPicture = this.getById(taskchildpictureid);
 
         //判断当前图片是否为历史图片
-        if (null != packageid && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) {
+        if (null != packageid && null != mainOcrTaskchildPicture.getPackageid() && !packageid.equals(mainOcrTaskchildPicture.getPackageid().toString())) {
 
             QueryWrapper<OcrTaskchildPicture> queryWrapperNew = new QueryWrapper<>();
             queryWrapperNew.eq("TENANTID", tenantId);