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

npe

This commit is contained in:
wangliwen 2022-06-27 17:40:55 +08:00
parent 78286468fa
commit 1e38a30eb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
View File

@ -183,7 +183,7 @@ public class CensusControllerV2 {
String sql = String.format("SELECT COUNT(id) FROM tb_data_resource WHERE dept_id = %s AND type = '应用资源' AND del_flag = 0;", index.get("id").toString());
logger.info(sql);
Long count = jdbcTemplate.queryForObject(sql, Long.class);
if (!"0".equals(index.get("pid").toString()) && higher) { // 有上级部门 且 配置资源归属上级
if (!"0" .equals(index.get("pid").toString()) && higher) { // 有上级部门 且 配置资源归属上级
Optional<SysDeptDTO> sysDeptDTO =
Optional.ofNullable(sysDeptService.get(Long.valueOf(index.get("pid").toString())));
if (sysDeptDTO.isPresent() && sysDeptDTO.get().getType() != null && sysDeptDTO.get().getType() >= 2) {
@ -413,7 +413,7 @@ public class CensusControllerV2 {
HashMap dataResource = (HashMap) tsingtaoDataResourceService.getDataResource(getDataResourceListDto);
result.add(new HashMap<String, Object>() {
{
put("amount", dataResource.get("rows"));
put("amount", (dataResource != null && dataResource.containsKey("rows") && dataResource.get("rows") != null) ? dataResource.get("rows") : 0);
put("type", "总数据数");
}
});
@ -431,7 +431,7 @@ public class CensusControllerV2 {
});
result.add(new HashMap<String, Object>() {
{
List<Map> lists = (List<Map>) dataResource.get("data");
List<Map> lists = (dataResource != null && dataResource.containsKey("data") && dataResource.get("data") != null) ? (List<Map>) dataResource.get("data") : new ArrayList<>();
ArrayList<Map> list = new ArrayList<>();
lists.forEach(item -> {
list.add(new HashMap<String, Object>() {{