From 39a3307341903cda79a0c022ca3f4e3d36b86727 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 31 Mar 2024 18:51:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=8C=85=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/oa/OcrTaskchildPictureMapper.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 a025616f..64f09cb8 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
@@ -593,9 +593,9 @@
t1.photo_date_timestamp photoDateTimestamp
FROM ocr_picture t1
LEFT JOIN ocr_taskchild_picture t2
- on t1.ID = t2.PICTUREID and t1.suspiciousfile = 0
+ on t1.ID = t2.PICTUREID
LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
- where t1.ID in
+ where t1.suspiciousfile = 0 and t1.ID in
#{item}
@@ -698,10 +698,10 @@
t1.max_similarity maxSimilarity,
ifnull(t4.STATSHIS, 1) historyStates
FROM ocr_check_duplicate_result t1
- LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID and t2.suspiciousfile = 0
+ LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID and t4.TASKNAME = '${taskname}'
- WHERE t1.check_duplicate_id = #{checkDuplicateId}
+ WHERE t1.check_duplicate_id = #{checkDuplicateId} and t2.suspiciousfile = 0
and t1.picture_id != #{pictureId}