From 3887ab83d2c3d7ac1f237144bba2acc8d04a03d0 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Thu, 25 Jul 2024 00:15:38 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/oa/OcrTaskchildPictureMapper.xml     | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 3a4861b4..6c12862c 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
@@ -1024,7 +1024,6 @@
         from ocr_taskchild_picture tcp
                  left join ocr_picture pic
                            on tcp.PICTUREID = pic.ID
-        left join ocr_contractor_task oct on pic.tenant_id = oct.tenant_id and  pic.${contractor.value} = oct.contractor
         <include refid="Base_Where_union">
         </include>
         and tcp.ISFINAIL = 1
@@ -1036,10 +1035,13 @@
         <if test="thisLoginUserid != null and isFail != null">
             and (FIND_IN_SET(#{thisLoginUserid.value}
               , tcp.ASSIGNEE) or
+        <if test="contractor != null">
             if((select count(1) from ocr_contractor_task where tenant_id =#{tenantid.value} and pic.${contractor.value} = contractor and task_user_assignee = #{thisLoginUserid.value})>1, 1=1,tcp.STATES = 5))
-<!--             or (oct.id is not null and oct.tenant_id = #{tenantid}) or tcp.STATES = 5)-->
         </if>
-
+        <if test="contractor == null">
+           tcp.STATES = 5
+        </if>
+        </if>
         <if test="fromuptimeStart != null">
             and tcp.fromuptime &gt;= ${fromuptimeStart.value}
         </if>