Merge pull request 'fix:高级检索修复审批状态查询' (#80) from fix/Query_task_approval_status into test

Reviewed-on: #80

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>