From 4c5cd99deb7974294cda88985e10b634670897f7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 24 Mar 2023 10:30:13 +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

---
 .../service/basic/impl/BasicBussinessTypeServiceImpl.java   | 6 +++---
 .../mybatis/mapper/basic/BasicBussinessTypeDao.xml          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
index b6438482..569c30d0 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
@@ -204,18 +204,18 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
 
             case Constant.ORDER_ACTION_PRE_DETAIL:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("actionType", 3).eq("inStock", true));
+                        .eq("actionType", 3).eq("inStock", true).eq("enable",true));
                 break;
             case Constant.ORDER_ACTION_SUP_DELIVERY:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("inStock", false));
+                        .eq("spUse", true).eq("inStock", false).eq("enable",true));
 
                 break;
             case Constant.ORDER_ACTION_SUP_INVOICE:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("actionType", 1));
+                        .eq("spUse", true).eq("actionType", 1).eq("enable",true));
                 break;
             default:
                 break;
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index d67e15f9..61377fd2 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -243,10 +243,10 @@
             <if test="action != ''and action != null">
                 AND basic_bussiness_type.action = #{action}
             </if>
-            <if test="enable != ''and enable != null">
+            <if test="enable != null">
                 AND basic_bussiness_type.enable = #{enable}
             </if>
-            <if test="spUse != ''and spUse != null">
+            <if test="spUse != null">
                 AND basic_bussiness_type.spUse = #{spUse}
             </if>
             <if test="code != ''and code != null">