From ceff620235d2f3770da3b7ae00b2608573324a57 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 22 Apr 2024 22:33:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8C=85=E4=B8=BB=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java     | 6 +++++-
 .../src/main/resources/mapper/oa/OcrPictureMapper.xml       | 2 --
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml  | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index 189d4ea8..10b69d09 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -330,7 +330,11 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
     @Override
     public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
         OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
-        ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp());
+        OcrPictureInfo one = ocrPictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrPicture.getId()));
+        ocrPicture.setPictureInfo(one);
+        if(ObjectUtil.isNotEmpty(one)){
+            ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp());
+        }
         return ocrPicture;
     }
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
index 7c9805ca..d499b250 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
@@ -227,7 +227,6 @@
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
         SELECT t2.*,
-               t3.*,
                t4.STATES,
                t4.TASKID,
                t4.ID         taskchildId,
@@ -240,7 +239,6 @@
                        1) AS historyStates
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
-                 left join ocr_picture_info t3 on t2.ID = t3.picture_id
                  left join ocr_taskchild_picture t4 on t2.ID = t4.PICTUREID
         where t1.check_duplicate_id = #{packageId}
           and t2.suspiciousfile = 0
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index 6a8e0c8a..26e8d481 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -1084,7 +1084,6 @@
         LIMIT 1), 1) AS historyStates
         from ocr_picture t2
         LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
-        left join ocr_picture_info t5 on t2.ID = t5.picture_id
         WHERE t2.suspiciousfile = 0
         and t2.ID in
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
-- 
2.39.3