From c58a6123accb90b65be62c669ccdb5048297ce6f Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 18 Mar 2024 09:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 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 9460d317..a017c72a 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
@@ -207,24 +207,29 @@ select tcp.* from (
 	</select>
 
 	<select id="listmytask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" parameterType="java.util.Map">
-
 		select tcp.* from (
-			select
-			tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
-			from ocr_taskchild_picture tc
-			LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
-			where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
+		select
+		tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
+		from ocr_taskchild_picture tc
+		LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
+		where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
+		and tc.STATES = 2
 		UNION
-			select
-			tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
-			from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
-			where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
-			<if test="thisLoginUserid != null"> and uf.USERID = #{thisLoginUserid}</if>
+		select
+		tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
+		from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
+		where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
+		<if test="thisLoginUserid != null">
+			and uf.USERID = #{thisLoginUserid}
+		</if>
 		) as tcp
-		<include refid="Base_Where_union"></include>
+		<include refid="Base_Where_union">
+		</include>
 
 		<if test="page != null">
-			<if test="page.sortname != null"> order by tcp.${page.sortname} ${page.sortorder}</if>
+			<if test="page.sortname != null">
+				order by tcp.${page.sortname} ${page.sortorder}
+			</if>
 			limit ${page.start}, ${page.Pagesize}
 		</if>
 	</select>