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() - .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() .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() .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 @@ AND basic_bussiness_type.action = #{action} - + AND basic_bussiness_type.enable = #{enable} - + AND basic_bussiness_type.spUse = #{spUse}