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

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-10 10:26:02 +08:00
parent cc1ae60000 3721c336c3
commit 26dc0e0c6d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2385,7 +2385,6 @@ 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\", " +
@ -2447,6 +2446,10 @@ 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;