Merge pull request 'sunchenliang' (#35) from sunchenliang into test

Reviewed-on: #35

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
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
             #{item}
         </foreach>
@@ -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
         <if test="pictureId != null and pictureId != ''">
             and t1.picture_id != #{pictureId}
         </if>