Merge branch 'master' into docker_package
This commit is contained in:
commit
24f1053ddd
|
@ -919,11 +919,11 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
item.setValue(index.get("total"));
|
||||
}
|
||||
}));
|
||||
final int[] sum = {0};
|
||||
map1.values().forEach(index -> {
|
||||
sum[0] = sum[0] + Integer.parseInt(index.toString());
|
||||
});
|
||||
map1.put("0", (Integer.valueOf(map1.get("0").toString())) + (deptCount - sum[0]));
|
||||
// final int[] sum = {0};
|
||||
// map1.values().forEach(index -> {
|
||||
// sum[0] = sum[0] + Integer.parseInt(index.toString());
|
||||
// });
|
||||
// map1.put("0", (Integer.valueOf(map1.get("0").toString())) + (deptCount - sum[0]));
|
||||
resultMap.put("deptTotalCount", map1);
|
||||
return resultMap;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue