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