From f277767e27f08623dc9b033bc11c572d98b09694 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Tue, 9 Apr 2024 20:36:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
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 e62cbb75..78a36e69 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
@@ -499,19 +499,6 @@
                     </if>
                     ${izupuser.likeend}
                 </if>
-                <if test="izApprovalStatus != null">
-                    ${izApprovalStatus.rulesOp} tcp.FROMUSERID ${izApprovalStatus.dataOp} ${izApprovalStatus.likestar}
-                    <!--				#{fromuserid.value}-->
-                    <if test="izApprovalStatus.value instanceof java.util.List">
-                        <foreach item="item" collection="izApprovalStatus.value" open="" separator="," close="">
-                            #{item}
-                        </foreach>
-                    </if>
-                    <if test="!izApprovalStatus.value instanceof java.util.List">
-                        #{izApprovalStatus.value}
-                    </if>
-                    ${izApprovalStatus.likeend}
-                </if>
                 <if test="iztaskrrom != null">
                     ${iztaskrrom.rulesOp} tcp.FROMSOURCEID ${iztaskrrom.dataOp} ${iztaskrrom.likestar}
                     <!--				#{fromuserid.value}-->
@@ -655,6 +642,12 @@
         where tc.ASSIGNEE = #{searchassignee}
         and tc.TENANTID = #{searchtenantid}
         and tc.STATES = 2
+        <if test="izApprovalStatus != null ">
+            ${izApprovalStatus.rulesOp}
+            (
+            #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
+            )
+        </if>
         UNION
         select tc.*,
         uf.COMMENTHIS,
@@ -675,6 +668,12 @@
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
         </if>
+        <if test="izApprovalStatus != null ">
+            ${izApprovalStatus.rulesOp}
+            (
+             #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
+            )
+        </if>
         ) as tcp
         <include refid="Base_Where_union">
         </include>
@@ -703,6 +702,12 @@
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
         </if>
+        <if test="izApprovalStatus != null ">
+            ${izApprovalStatus.rulesOp}
+            (
+            #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
+            )
+        </if>
         ) as tcp
         <include refid="Base_Where_union">
         </include>
-- 
2.39.3