|
|
@@ -1,5 +1,7 @@
|
|
|
package com.jzg.console.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.map.MapUtil;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.jzg.commons.constants.report.enums.SearchKeyCodeEnum;
|
|
|
import com.jzg.commons.entity.po.SysArea;
|
|
|
@@ -16,10 +18,7 @@ import com.jzg.console.service.ReportSearchConfigurationService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.LinkedList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -146,9 +145,11 @@ public class ReportSearchConfigurationServiceImpl extends ServiceImpl<ReportSear
|
|
|
SysDeptVo sysDeptv = new SysDeptVo(item);
|
|
|
voDept.add(sysDeptv);
|
|
|
});
|
|
|
- Map<String, List<SysDeptVo>> map = voDept.stream().collect(Collectors.groupingBy(SysDeptVo::getParentId));
|
|
|
+ Map<String, List<SysDeptVo>> map = voDept.stream()
|
|
|
+ .collect(Collectors.groupingBy(SysDeptVo::getParentId));
|
|
|
voDept.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
|
|
|
- List<SysDeptVo> sysDeptVos = map.get("0");
|
|
|
+ // 不会为null
|
|
|
+ List<SysDeptVo> sysDeptVos = map.getOrDefault("0", new ArrayList<>());
|
|
|
List<SysDeptVo> newResultDept = new ArrayList<>();
|
|
|
newResultDept.addAll(sysDeptVos);
|
|
|
return newResultDept;
|
|
|
@@ -194,7 +195,7 @@ public class ReportSearchConfigurationServiceImpl extends ServiceImpl<ReportSear
|
|
|
});
|
|
|
Map<String, List<UserTreeDto>> map = voUserList.stream().collect(Collectors.groupingBy(UserTreeDto::getParentId));
|
|
|
voUserList.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
|
|
|
- List<UserTreeDto> sysUserVos = map.get("0");
|
|
|
+ List<UserTreeDto> sysUserVos = map.getOrDefault("0", new ArrayList<>());
|
|
|
List<UserTreeDto> newResultDept = new ArrayList<>();
|
|
|
newResultDept.addAll(sysUserVos);
|
|
|
return newResultDept;
|