Merge branch 'master' of https://git.mcnetmart.com/guoxiangbin/ocr

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);