补充提交

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseMapper.java

@@ -154,7 +154,7 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
             "LEFT JOIN ecw_region r2 ",
             "ON w.shi = r2.id ",
             "WHERE  w.deleted = 0 AND w.`status` =0 ",
-            "<if test= 'tradeType != null'>",
+            "<when test= 'tradeType != null'>",
              "AND trade_type =#{tradeType}",
             "</when>",
             "</script>"

yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/admin/warehouse/WarehouseController.java

@@ -103,7 +103,7 @@ public class WarehouseController {
     @GetMapping("/getWarehouseTreeList")
     @ApiModelProperty("获取仓库区域树形列表")
     @ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = false, example = "1", dataTypeClass = Integer.class)
-    public  CommonResult<List<WarehouseTreeVO>> getWarehouseTreeLis(Integer tradeType){
+    public  CommonResult<List<WarehouseTreeVO>> getWarehouseTreeList(Integer tradeType){
         List<WarehouseTreeVO> list = warehouseService.getWarehouseTreeList(tradeType);
         return success(list);
     }

yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/app/warehouse/AppWarehouseController.java

@@ -179,7 +179,7 @@ public class AppWarehouseController {
     @GetMapping("/getWarehouseTreeList")
     @ApiModelProperty("获取仓库区域树形列表")
     @ApiImplicitParam(name = "tradeType", value = "进出口类型,1-进口，2-出口", required = false, example = "1", dataTypeClass = Integer.class)
-    public  CommonResult<List<WarehouseTreeVO>> getWarehouseTreeLis(Integer tradeType){
+    public  CommonResult<List<WarehouseTreeVO>> getWarehouseTreeList(Integer tradeType){
         List<WarehouseTreeVO> list = warehouseService.getWarehouseTreeList(tradeType);
         return success(list);
     }