From 9904fff69ff957649bb16c2f51eab6b551c9f90c Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 8 Nov 2023 14:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=83=A8=E9=97=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=93=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/basic/FilterBussinessTypeRequest.java    | 1 +
 .../resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
index dda44606a..760ce7197 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java
@@ -122,4 +122,5 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
      * 是否启用, 1：仅查看，2：增删改查
      */
     private Integer editType;
+    private String deptCode;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index 6c2828000..19d8bf0c5 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -198,6 +198,7 @@
         SELECT basic_bussiness_type.*
         FROM basic_bussiness_type
                      left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
+                     left join auth_warehouse on auth_user_bustype.subInvCode = auth_warehouse.`code`
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@@ -224,6 +225,9 @@
             <if test="invCode != ''and invCode != null">
                 AND subInvCode = #{invCode}
             </if>
+            <if test="deptCode != ''and deptCode != null">
+                AND auth_warehouse.parentId = #{deptCode}
+            </if>
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}
             </if>