Merge branch 'dev'
This commit is contained in:
commit
88e00d54d8
|
@ -919,7 +919,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
item.setValue(index.get("total"));
|
||||
}
|
||||
}));
|
||||
map1.put("0", (long) map1.get("0") + (deptCount - map1.values().stream().mapToLong(index -> (long) index).sum()));
|
||||
map1.put("0", (int) map1.get("0") + (deptCount - map1.values().stream().mapToInt(index -> (int) index).sum()));
|
||||
resultMap.put("deptTotalCount", map1);
|
||||
return resultMap;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue