From 815f8cf710a592c7b92942f4b80193c0a91c41b0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 08:14:57 +0800
Subject: [PATCH] 物料关系字段显示修复

---
 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