修改任务列表数据重复问题

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 count(tcp.ID) from (
-			select
+        select
-			tc.*
+        tc.*
-			from ocr_taskchild_picture tc
+        from ocr_taskchild_picture tc
-			where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
+        where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
-		UNION
+        and tc.STATES=2
-			select
+        UNION
-			tc.*
+        select
-			from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
+        tc.*
-			where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
+        from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
-			<if test="thisLoginUserid != null"> and uf.USERID = #{thisLoginUserid}</if>
+        where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
-		) as tcp
+        <if test="thisLoginUserid != null">
-		<include refid="Base_Where_union"></include>
+            and uf.USERID = #{thisLoginUserid}
-	</select>
+        </if>
+        ) as tcp
+        <include refid="Base_Where_union">
+        </include>
+    </select>