From b30ad9b3a89e398091e151b41a0b9e2158ae9019 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 11 Apr 2023 11:54:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/inout/IoOrderDao.xml       | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index a60b00cb..712fbb3f 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -89,17 +89,22 @@
                 AND orderType = #{orderType}
             </if>
 
-            <if test="supInoivceSearch != null and invoiceActions1 !=null or invoiceActions2 !=null">
-                AND ((`action` in
-                <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-                and status = 10) or ((
-                        `action` in
-                <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>) and status = 7
+            <if test="supInoivceSearch != null">
+                <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
+                    AND ((`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and status = 10)
+                </if>
+                <if test="invoiceActions2 != null and invoiceActions2.size() != 0">
+                    or ((
+                    `action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>) and status = 7
                     ))
+                </if>
             </if>
         </where>
         order by createTime desc