From 8955091768ee0db76bcb0efa2b83939ee8e80493 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Sat, 20 Apr 2024 16:29:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=8A=B6=E6=80=81=20=E6=9C=AA?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=B3=95=E6=9F=A5?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/controller/OcrPictureController.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
index a569610..420578b 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
@@ -302,8 +302,13 @@ public class OcrPictureController extends BaseController {
         //任务状态搜索
         String iztaskstatus = req.getParameter("iztaskstatus");
         if (StringUtils.isNotBlank(iztaskstatus)) {
-//            String [] status = iztaskstatus.split(",");
-            queryWrapper.apply("id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES in ("+iztaskstatus+"))");
+            if(iztaskstatus.indexOf("1")!=-1){
+                //包含未提交的情况
+                queryWrapper.apply("(id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES in ("+iztaskstatus+")) or similarity_score is null)");
+            }else{
+                queryWrapper.apply("id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES in ("+iztaskstatus+"))");
+            }
+
         }