|
@@ -821,7 +821,7 @@ public class SysStatisticManager {
|
|
|
|
|
|
// 获取服务评分
|
|
|
List<WmScorePackage> pkgs = packageService.list(Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
- .eq(WmScorePackage::getTypeid, UpmsType.PackageType.TYPE_1)
|
|
|
+ .eq(WmScorePackage::getTypeid, UpmsType.PackageType.TYPE_2)
|
|
|
.eq(WmScorePackage::getEnableFlag, EnableEnum.ENABLE.val()));
|
|
|
|
|
|
List<Integer> pIds = pkgs.stream().mapToInt(p -> Integer.parseInt(p.getId())).boxed().distinct().sorted().collect(Collectors.toList());
|
|
@@ -895,7 +895,7 @@ public class SysStatisticManager {
|
|
|
// 服务商评分
|
|
|
List<WmScorePackage> packages = deptPackageMap.get(d.getDeptId().toString());
|
|
|
|
|
|
- List<Map<String, Object>> pMaps = packages.stream().map(p -> {
|
|
|
+ List<Map<String, Object>> pMaps = CollUtil.isEmpty(packages) ? Collections.emptyList() : packages.stream().map(p -> {
|
|
|
Map<String, Object> m = new HashMap<>(3);
|
|
|
m.put("id", p.getId());
|
|
|
m.put("pkgName", p.getScorePackageName());
|