Compare commits

..

No commits in common. "26dc0e0c6d4c1199afcc6afe2449c063c89197c4" and "cc1ae600003a82ee18e4fe6ef856a46b4a61645a" have entirely different histories.

1 changed files with 1 additions and 4 deletions

View File

@ -2385,6 +2385,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Map<String, Object>> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("deptId").toString()); List<Map<String, Object>> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("deptId").toString());
if (lcDept.isEmpty()) { if (lcDept.isEmpty()) {
logger.error("未查询到{}对应的浪潮系统部门", params.get("deptId").toString()); logger.error("未查询到{}对应的浪潮系统部门", params.get("deptId").toString());
// return new ArrayList<>();
} else { } else {
StringBuilder sb = new StringBuilder("SELECT " + StringBuilder sb = new StringBuilder("SELECT " +
" COUNT( BSNUM ) AS \"count\", " + " COUNT( BSNUM ) AS \"count\", " +
@ -2446,10 +2447,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
countMap.put(item.get("type").toString(), Integer.parseInt(item.get("count").toString())); countMap.put(item.get("type").toString(), Integer.parseInt(item.get("count").toString()));
} }
}); });
if (!cloud) {
map.put("yzy", "0");
map.put("ysp", "0");
}
resultList.add(map); resultList.add(map);
}); });
Integer total = 0; Integer total = 0;