From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 0775852..bf3a1de 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
@@ -107,16 +107,16 @@
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
@PostMapping("/matnrGroup/tree")
- public R tree(@RequestBody Map<String, Object> map) {
+ public R tree(@RequestBody(required = false) Map<String, Object> map) {
List<MatnrGroup> matnrs = new ArrayList<>();
- matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
-// if (Objects.isNull(map)) {
-// } else {
-// if (Objects.isNull(map.get("condition"))) {
-// return R.ok("condition鍙傛暟涓嶈兘涓虹┖锛侊紒");
-// }
-// matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition")));
-// }
+ if (Objects.isNull(map)) {
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
+ } else {
+ if (Objects.isNull(map.get("condition"))) {
+ return R.ok("condition鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition")));
+ }
List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
return R.ok().add(treeData);
}
--
Gitblit v1.9.1