修改 获取物料分组， 库位类型列表报错问题修复

skyouc

2025-03-24 7232279f6e73cc0e9a851da14b0a30131503f601

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java

@@ -23,6 +23,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@Api(tags = "物料分组")
@RestController
@@ -35,6 +36,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)));
    }
@@ -140,17 +142,12 @@
    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/tree")
    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")));
            return R.error("参数不能为空！！");
        }
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        return R.ok().add(treeData);
        List<MatnrGroup> matnrs = matnrGroupService.getTreeData(map);

        return R.ok().add(matnrs);
    }