From 7f32d1b00569bcab95538d6cbd2f68da163ab79c Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Tue, 15 Nov 2022 17:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=94=B9=E5=8D=95=E6=8D=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E5=8F=96=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/BussinessLocalTypeController.java    | 8 +++++---
 .../admin/req/basic/BussinessLocalTypeFilterRequest.java  | 1 +
 .../mybatis/mapper/basic/BussinessLocalTypeDao.xml        | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java
index 7cc09c5..6cc91f5 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java
@@ -90,9 +90,11 @@ public class BussinessLocalTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         String customerId = getCustomerId();
-        if(bussinessTypeFilterRequest.getType()==1){
-           Integer userId=customerService.getUserId();
-           bussinessTypeFilterRequest.setUserId(userId);
+        if(bussinessTypeFilterRequest.getType()!=null){
+            if(bussinessTypeFilterRequest.getType()==1) {
+                Integer userId=customerService.getUserId();
+                bussinessTypeFilterRequest.setUserId(userId);
+            }
         }
 
         if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
index ca41539..c5dca5f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java
@@ -17,6 +17,7 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private Boolean spUse;
     private Boolean isFilter;
     private String code;
+    private String invWarehouseCode;
     private Integer userId;
     private String lastUpdateTime;
     private Integer type;
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
index 56b945f..f75247b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
@@ -124,6 +124,9 @@
             <if test="code != ''and code != null">
                 AND inv_warehouse_user.`code` = #{code}
             </if>
+            <if test="invWarehouseCode != ''and invWarehouseCode != null">
+                AND inv_warehouse_sub.`code` = #{invWarehouseCode}
+            </if>
             <if test="userId != ''and userId != null">
                 AND inv_bustype_user.`userId` = #{userId}
             </if>