From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java
index 50083ca..4c7a147 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/WarehouseServiceImpl.java
@@ -10,6 +10,7 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.StrUtils;
import org.jeecg.modules.tms.entity.Warehouse;
+import org.jeecg.modules.tms.entity.vo.DictVo;
import org.jeecg.modules.tms.mapper.WarehouseMapper;
import org.jeecg.modules.tms.service.IWarehouseService;
import org.springframework.stereotype.Service;
@@ -30,7 +31,7 @@
@Override
public List<CommonGenericTree<Warehouse>> loadTree() {
List<Warehouse> warehouseList = list(new LambdaQueryWrapper<Warehouse>()
- .eq(Warehouse::getStatus, CommonConstant.STATUS_1));
+ .eq(Warehouse::getStatus, CommonConstant.STATUS_1).orderByAsc(Warehouse::getSeq));
return loadTree(warehouseList);
}
@@ -57,6 +58,11 @@
return this.baseMapper.queryPageList(page, queryWrapper);
}
+ @Override
+ public List<DictVo> queryWarehouseDictList() {
+ return this.baseMapper.queryWarehouseDictList();
+ }
+
private List<CommonGenericTree<Warehouse>> loadTree(List<Warehouse> warehouseList) {
Warehouse warehouse = new Warehouse();
List<CommonGenericTree<Warehouse>> list = new ArrayList<>();
--
Gitblit v1.9.3