BUG修复

skyouc

6 小时以前 ff31d592924958958c21fdef1975d499586d964f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java

@@ -13,7 +13,7 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.List;	
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -35,15 +35,26 @@
                        .like(MatnrGroup::getName, map.get("condition"))
                        .orderByAsc(MatnrGroup::getCode));
                List<Long> collect = groups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
                List<MatnrGroup> list = this.list(new LambdaQueryWrapper<MatnrGroup>().in(MatnrGroup::getId, collect));
                List<MatnrGroup> list = this.list(new LambdaQueryWrapper<MatnrGroup>().in(!collect.isEmpty(), MatnrGroup::getId, collect));
                matnrs.addAll(list);
                List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
                if (matnrs.isEmpty()) {
                    return new ArrayList<>();
                }
                MatnrGroup one = this.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, 0));
                if (Objects.isNull(one)) {
                    throw new CoolException("顶级分组不存在，请添加后再操作！！");
                }

                List<MatnrGroup> treeData = Utils.toTreeData(matnrs, one.getId(), MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
                return treeData;
            } else {
                matnrs = this.list(new LambdaQueryWrapper<MatnrGroup>().orderByAsc(MatnrGroup::getCode));
            }
        }
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        if (treeData.isEmpty()) {
            return new ArrayList<>();
        }
        return treeData;
    }
}