修改任务审批列表数据重复

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}
+		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>
+		<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>