From 85e36a5016633748bbd76bb4ddaef49566a505d5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java
index 6050308..4b2b3c4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/WarehouseController.java
@@ -9,6 +9,8 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
@@ -66,11 +68,18 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<Warehouse> queryWrapper = QueryGenerator.initQueryWrapper(warehouse, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
Page<Warehouse> page = new Page<Warehouse>(pageNo, pageSize);
- IPage<Warehouse> pageList = warehouseService.page(page, queryWrapper);
+ IPage<Warehouse> pageList = warehouseService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
+
+ @ApiOperation(value="tms_warehouse-鍔犺浇鏍戝舰缁撴瀯鏁版嵁", notes="tms_warehouse-鍔犺浇鏍戝舰缁撴瀯鏁版嵁")
+ @GetMapping(value = "/loadTree")
+ public Result<?> loadTree() {
+ List<CommonGenericTree<Warehouse>> treeList = warehouseService.loadTree();
+ return Result.OK(treeList);
+ }
/**
* 娣诲姞
--
Gitblit v1.9.3