From feccc47758e579ec466b013a77b43b3a67b131c3 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 25 Oct 2023 18:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/basic/BasicBussinessTypeController.java     | 1 +
 .../resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
index 42d34ea5e..f7322acab 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
@@ -194,6 +194,7 @@ public class BasicBussinessTypeController extends BaseController {
                 FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();
                 tempRequest.setCode(bussinessTypeFilterRequest.getCode());
                 tempRequest.setInvCode(bussinessTypeFilterRequest.getInvCode());
+                tempRequest.setMainAction(bussinessTypeFilterRequest.getMainAction());
                 List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(tempRequest);
                 if (CollUtil.isNotEmpty(bussinessTypeResponses)) {
                     for (BasicBussinessTypeResponse bussinessTypExportResponse : bussinessTypeResponses) {
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index 699c3f0d5..6c2828000 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -268,6 +268,9 @@
             <if test="invCode != ''and invCode != null">
                 AND auth_warehouse_bustype.code = #{invCode}
             </if>
+            <if test="mainAction != ''and mainAction != null">
+                AND basic_bussiness_type.mainAction = #{mainAction}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>