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

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 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 84896666..72774344 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
@@ -242,20 +242,24 @@
         </if>
     </select>
 	<select id="listmytaskCount" resultType="java.lang.Long" parameterType="java.util.Map">
-		select count(tcp.ID) from (
-			select
-			tc.*
-			from ocr_taskchild_picture tc
-			where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
-		UNION
-			select
-			tc.*
-			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>
-	</select>
+        select count(tcp.ID) from (
+        select
+        tc.*
+        from ocr_taskchild_picture tc
+        where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
+        and tc.STATES=2
+        UNION
+        select
+        tc.*
+        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>
+    </select>