wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-26 14:22:17 +08:00
parent aaf7324d98 5edf6803e9
commit 84fc633381
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -939,10 +939,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (deptIds.isEmpty()) {
return resultMap;
}
String deptName=null;
String deptName = null;
SysDeptEntity deptEntity = sysDeptDao.selectById(deptIds.get(0));
if(deptEntity != null){
deptName=deptEntity.getName();
if (deptEntity != null) {
deptName = deptEntity.getName();
}
List<Map> resourceList = resourceDao.selectByDeptId(deptIds.get(0));
HashMap<String, Object> maxdeptMap = new HashMap<>();
@ -2033,9 +2033,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
});
resultList.add(map);
});
Integer total=0;
for(Integer count : countMap.values()){
total+=count;
Integer total = 0;
for (Integer count : countMap.values()) {
total += count;
}
countMap.put("count", total);
HashMap<String, Object> count = new HashMap<>();
@ -2065,9 +2065,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
});
resultList.add(map);
});
Integer total=0;
for(Integer count : countMap.values()){
total+=count;
Integer total = 0;
for (Integer count : countMap.values()) {
total += count;
}
countMap.put("count", total);
HashMap<String, Object> count = new HashMap<>();