From 1a2cc3cb5eccca12d3bdd0d4027f8fb4e417c63e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 16:17:48 +0800
Subject: [PATCH] 修改 1. 往来企业新增，修改添加空管 2. 物料分组添加默认排序
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index e34185e..fbc7197 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -35,6 +35,7 @@
@PostMapping("/matnrGroup/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
+ baseParam.setOrderBy("code asc");
PageParam<MatnrGroup, BaseParam> pageParam = new PageParam<>(baseParam, MatnrGroup.class);
return R.ok().add(matnrGroupService.page(pageParam, pageParam.buildWrapper(true)));
}
@@ -142,12 +143,13 @@
public R tree(@RequestBody(required = false) Map<String, Object> map) {
List<MatnrGroup> matnrs = new ArrayList<>();
if (Objects.isNull(map)) {
- matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().orderByAsc(MatnrGroup::getCode));
} else {
if (Objects.isNull(map.get("condition"))) {
return R.ok("condition鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition")));
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .like(MatnrGroup::getName, map.get("condition")).orderByAsc(MatnrGroup::getCode));
}
List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
return R.ok().add(treeData);
--
Gitblit v1.9.1