Merge branch 'dev'
This commit is contained in:
commit
cb3e72fd48
|
@ -2056,7 +2056,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
|
||||
@Override
|
||||
public Object selectDeptDetailTypeCountList(Map params) {
|
||||
if (params.containsKey("deptId") && org.apache.commons.lang3.StringUtils.isEmpty(params.get("deptId").toString())) {
|
||||
if (params.containsKey("deptId") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("deptId").toString())) {
|
||||
List<Map<String, Object>> typeCountListByDept = resourceDao.selectDeptDetailTypeCountList(params);
|
||||
Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString()));
|
||||
ArrayList<Map> resultList = new ArrayList<>();
|
||||
|
|
Loading…
Reference in New Issue