改单据功能选取单据类型问题

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)) {

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;

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>