diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java
index 25d39b53..59887fe1 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java
@@ -222,7 +222,7 @@ public class BussinessLocalTypeController {
         }
         if (bussinessTypeEntity != null) {
             bussinessTypeEntity.setAction("ST" + CustomUtil.getId());
-            BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction());
+            BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction());
             if (bussinessLocalTypeEntity != null) {
                 ResultVOUtils.error(999, "业务类型已存在！");
             } else {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index a654bf24..7eb6bf86 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -228,6 +228,9 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/findErrorByOrderId")
     public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
+        if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) {
+            return ResultVOUtils.error(500, "单据号不能为空!");
+        }
         List<WarehouseEntity> warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest);
         PageInfo<WarehouseEntity> pageInfo;
         pageInfo = new PageInfo<>(warehousetempList);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java
index fc9e7e5d..94643729 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java
@@ -1,6 +1,7 @@
 package com.glxp.api.admin.req;
 
 import lombok.Data;
+import reactor.util.annotation.NonNull;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
index 920a6ca0..d8d80200 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java
@@ -6,6 +6,7 @@ import lombok.Data;
 @Data
 public class WarehouseQueryRequest extends ListPageRequest {
 
+
     private String corpOrderId;
     private String code;
     private String udi;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java
index 5da34b32..ac98691b 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java
@@ -1,6 +1,7 @@
 package com.glxp.api.admin.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao;
 import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
@@ -122,6 +123,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
 
     @Override
     public BussinessLocalTypeEntity findByAction(String action) {
+        if(StrUtil.isEmpty(action)){
+            return null;
+        }
         BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
         bussinessLocalTypeFilterRequest.setAction(action);
         List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest);
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 ae54325d..1c3da925 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
@@ -21,7 +21,7 @@
                 AND spUse =#{spUse}
             </if>
         </where>
-
+        order by updateTime desc
 
     </select>
 
@@ -95,6 +95,7 @@
             </if>
         </where>
         group by basic_bussiness_type.action
+
     </select>
 
     <select id="filterJoinOrigin" parameterType="com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest"
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index a76a7cb3..9184edc1 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -44,7 +44,8 @@
                 AND basic_bustype_local.spUse =#{spUse}
             </if>
         </where>
-        GROUP BY basic_bussiness_type.id
+        GROUP BY basic_bussiness_type.
+        order by updateTime desc
     </select>