From dd5b553c747c8893351784253086da7c742f7d1a Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sat, 20 Apr 2024 11:59:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=88=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 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 29596027..471eaecd 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
@@ -995,8 +995,11 @@
 
     <select id="listFinalTask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture"
             parameterType="java.util.Map">
-        select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore,pic.server_thumbnail_url serverThumbnailUrl,
-        pic.imgUrl imgUrl
+        select tcp.*,
+               pic.field11              reporttime,
+               pic.similarity_score     similarityscore,
+               pic.server_thumbnail_url serverThumbnailUrl,
+               pic.imgUrl               imgUrl
         from ocr_taskchild_picture tcp
                  left join ocr_picture pic
                            on tcp.PICTUREID = pic.ID
@@ -1004,12 +1007,14 @@
         </include>
         and tcp.ISFINAIL = 1
         and pic.suspiciousfile = 0
-        <if test="thisLoginUserid != null and isFail ==null">
-            and tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+        <if test="thisLoginUserid != null and isFail == null">
+            and FIND_IN_SET(#{thisLoginUserid.value}
+              , tcp.ASSIGNEE)
         </if>
-        <if test="thisLoginUserid != null and isFail !=null">
-            and (tcp.ASSIGNEE ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
-            or tcp.STATES = 5)
+        <if test="thisLoginUserid != null and isFail != null">
+            and (FIND_IN_SET(#{thisLoginUserid.value}
+              , tcp.ASSIGNEE)
+             or tcp.STATES = 5)
         </if>
 
         <if test="fromuptimeStart != null">
@@ -1022,16 +1027,18 @@
             <if test="page.sortname != null">
                 <choose>
                     <when test="page.sortname == 'states'">
-                        ORDER BY tcp.${page.sortname} ${page.sortorder} , pic.similarity_score desc
+                        ORDER BY tcp.${page.sortname} ${page.sortorder}, pic.similarity_score desc
                     </when>
                     <when test="page.sortname == 'field1'">
                         ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
                     </when>
                     <otherwise>
+
                         ORDER BY pic.${page.sortname} ${page.sortorder}
                     </otherwise>
                 </choose>
             </if>
+
             limit ${page.start}, ${page.Pagesize}
         </if>
     </select>