From c466f4d8c054270821ed0263f390178995621a74 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 03 三月 2025 10:27:08 +0800 Subject: [PATCH] #新增 1. 添加EXcel导入功能模板 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 26d45fe..0775852 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 @@ -109,14 +109,14 @@ @PostMapping("/matnrGroup/tree") public R tree(@RequestBody Map<String, Object> map) { List<MatnrGroup> matnrs = new ArrayList<>(); - 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"))); - } + 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"))); +// } List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren); return R.ok().add(treeData); } -- Gitblit v1.9.1