From af7a0d4a3991165c4dab36d4eff57d87fa67496e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 03 三月 2025 17:04:09 +0800 Subject: [PATCH] #新增 1. 新增ASN单据 2. 新增PO单据 3. 修改文件上传模板功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 12 ++++++++++-- 1 files changed, 10 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 4d0887a..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,8 +107,16 @@ @PreAuthorize("hasAuthority('manager:matnrGroup:list')") @PostMapping("/matnrGroup/tree") - public R tree(@RequestBody Map<String, Object> map) { - List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>()); + public R tree(@RequestBody(required = false) 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"))); + } List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren); return R.ok().add(treeData); } -- Gitblit v1.9.1