From 1eea12e8a78806e2a4e032d19fdbdb8ee67a171f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 19 Apr 2023 18:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/sync/SpsSyncDownloadController.java   |  1 +
 .../resources/mybatis/mapper/inout/IoOrderDao.xml    | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
index a52bf1e7..bd8f0bd5 100644
--- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
+++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
@@ -351,6 +351,7 @@ public class SpsSyncDownloadController {
                     spsSyncOtherDataResponse.setTaskId(one.getId());
                     spsSyncOtherDataResponse.setIoCodeLostList((List<IoCodeLostEntity>) map.get(IoCodeLostEntity.class.getSimpleName()));
                     spsSyncOtherDataResponse.setIoCodeRelList((List<IoCodeRelEntity>) map.get(IoCodeRelEntity.class.getSimpleName()));
+
                 } catch (FileNotFoundException e) {
                     throw new RuntimeException("系统异常，未找到对应数据文件");
                 } catch (IOException e) {
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 9ea0f9f9..e5e7f347 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -99,7 +99,7 @@
             </if>
 
             <if test="supInoivceSearch != null">
-                <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
+                <if test="invoiceActions1 != null and invoiceActions2 == null">
                     AND ((`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
@@ -133,19 +133,18 @@
                 </if>
             </if>
 
-            <if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0 ">
-
+            <if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0">
                 <if test="invoiceActions2 != null and invoiceActions2.size() != 0">
                     and (
-                    `action` in
+                            `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7
-                    )
+                            )
                 </if>
             </if>
-            <if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size()== 0 ">
+            <if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size() == 0">
                 <if test="invoiceActions1 != null and invoiceActions2 == null">
                     AND (`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
@@ -154,7 +153,6 @@
                     and status = 10)
                 </if>
             </if>
-
         </where>
         order by createTime desc
     </select>