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 and tcp.ISFINAIL = 1 @@ -1036,10 +1035,13 @@ and (FIND_IN_SET(#{thisLoginUserid.value} , tcp.ASSIGNEE) or + 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)) - - + + tcp.STATES = 5 + + and tcp.fromuptime >= ${fromuptimeStart.value}