From 9dd987af01431ecafa5264fe9ceac618ed360c86 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 19 Apr 2023 17:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../req/auth/FilterInvWarehouseRequest.java   |  2 +-
 .../glxp/api/service/auth/DeptService.java    |  2 +-
 .../service/auth/impl/DeptServiceImpl.java    |  2 +-
 .../mybatis/mapper/inout/IoOrderDao.xml       | 27 +++++++++++++++++--
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
index 2e87d47c..85cbbd11 100644
--- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java
@@ -14,7 +14,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String code;
     private String name;
     private String deptCode;
-    private Boolean advanceType;
+    private Integer advanceType;
     private Boolean isDefault;
     private Date updateTime;
     private Integer level;
diff --git a/src/main/java/com/glxp/api/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java
index 66e0d853..fa89c528 100644
--- a/src/main/java/com/glxp/api/service/auth/DeptService.java
+++ b/src/main/java/com/glxp/api/service/auth/DeptService.java
@@ -11,7 +11,7 @@ import java.util.List;
 public interface DeptService {
 
     List<String> selectByIdCode(List<String> list);
-    DeptEntity findDefault(Boolean advaceType, Boolean isDefault);
+    DeptEntity findDefault(Integer advaceType, Boolean isDefault);
 
     DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java
index 7a19c44d..f67f0c63 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java
@@ -28,7 +28,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    public DeptEntity findDefault(Boolean advaceType, Boolean isDefault) {
+    public DeptEntity findDefault(Integer advaceType, Boolean isDefault) {
         FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
         filterInvWarehouseRequest.setIsDefault(isDefault);
         filterInvWarehouseRequest.setAdvanceType(advaceType);
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index ba90426c..ff416d5d 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -92,7 +92,7 @@
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions1.size() != 0">
-                    AND (`action` in
+                    AND ((`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -105,9 +105,32 @@
                         #{item}
                     </foreach>
                     and status = 7
-                            )
+                            ))
+                </if>
+            </if>
+
+            <if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0 ">
+
+                <if test="invoiceActions2 != null and invoiceActions2.size() != 0">
+                    and (
+                    `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="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>
+
         </where>
         order by createTime desc
     </select>