Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-17 16:29:09 +08:00
commit daf2836de8
1 changed files with 1 additions and 1 deletions

View File

@ -2114,7 +2114,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<HashMap<String, Object>> temp = typeCountListMap2.keySet().stream().map(index_ -> {
HashMap<String, Object> map = new HashMap<>();
typeCountListMap2.get(index_).stream().forEach(count -> {
map.put(count.get("type").toString(), Integer.parseInt(count.get("type").toString()));
map.put(count.get("type").toString(), Integer.parseInt(count.get("count").toString()));
if (countMap.containsKey(count.get("type"))) {
countMap.replace(count.get("type").toString(), Integer.parseInt(count.get("count").toString()) + countMap.get(count.get("type")));
} else {