|
@@ -63,21 +63,26 @@ public class SysSceneServiceImpl extends ServiceImpl<SysSceneMapper, SysScene> i
|
|
|
private List<Tree<Long>> getSceneTree(Long parentId) {
|
|
|
LambdaQueryWrapper<SysScene> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
|
|
List<SysScene> list = this.list(lambdaQueryWrapper);
|
|
|
- List<TreeNode<Long>> collect = list.stream().filter(item -> !item.getId().equals(item.getPaterId())).sorted(Comparator.comparingInt(SysScene::getWeigh)).map(item -> {
|
|
|
- TreeNode<Long> treeNode = new TreeNode();
|
|
|
- treeNode.setId(item.getId());
|
|
|
- treeNode.setParentId(item.getPaterId());
|
|
|
- treeNode.setName(item.getSceneCode());
|
|
|
- treeNode.setWeight(item.getWeigh());
|
|
|
- Map<String, Object> extra = new HashMap<>(1);
|
|
|
- extra.put(LambdaUtils.getProperty(SysScene::getSceneCode), item.getSceneCode());
|
|
|
- treeNode.setExtra(extra);
|
|
|
- return treeNode;
|
|
|
- }).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<TreeNode<Long>> collect = list.stream()
|
|
|
+ .filter(item -> !item.getId().equals(item.getPaterId()))
|
|
|
+ .sorted(Comparator.comparingInt(SysScene::getWeigh))
|
|
|
+ .map(item -> {
|
|
|
+ TreeNode<Long> treeNode = new TreeNode();
|
|
|
+ treeNode.setId(item.getId());
|
|
|
+ treeNode.setParentId(item.getPaterId());
|
|
|
+ treeNode.setName(item.getName());
|
|
|
+ treeNode.setWeight(item.getWeigh());
|
|
|
+ Map<String, Object> extra = new HashMap<>(1);
|
|
|
+ extra.put(LambdaUtils.getProperty(SysScene::getSceneCode), item.getSceneCode());
|
|
|
+ treeNode.setExtra(extra);
|
|
|
+ return treeNode;
|
|
|
+ })
|
|
|
+ .collect(Collectors.toList());
|
|
|
return TreeUtil.build(collect, parentId);
|
|
|
}
|
|
|
|
|
|
- @ApiOperation(value = "删除" ,notes = "有子类不能删除")
|
|
|
+ @ApiOperation(value = "删除", notes = "有子类不能删除")
|
|
|
@PostMapping("del")
|
|
|
public R deleteById(@RequestBody @Validated GoodsCategoryDto.IdDto idDto) {
|
|
|
//判断是否有子类
|