feat：修改创建任务逻辑

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>