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

..

This commit is contained in:
dinggang 2022-12-15 16:43:19 +08:00
parent 38bd349887
commit d403b27c5f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java
View File

@ -287,8 +287,8 @@ public class MonitorController {
"&start=" + start + "&start=" + start +
"&end=" + end + "&end=" + end +
"&step=" + step; "&step=" + step;
ResponseEntity<HashMap> entity = restTemplate.getForEntity(url, HashMap.class, query); ResponseEntity<HashMap> entity = restTemplate.getForEntity(url, HashMap.class, query);
HashMap body = entity.getBody(); HashMap body = entity.getBody();
HashMap data = (HashMap) body.get("data"); HashMap data = (HashMap) body.get("data");
if (data != null) { if (data != null) {

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

@ -2874,7 +2874,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
sb.append(" AND apply.\"resourceName\" LIKE '%" + params.get("resourceName").toString() + "%'"); sb.append(" AND apply.\"resourceName\" LIKE '%" + params.get("resourceName").toString() + "%'");
} }
sb.append(" ORDER BY apply.\"createDate\" DESC"); sb.append(" ORDER BY apply.\"createDate\" DESC");
List<Map<String, Object>> list = null; List<Map<String, Object>> list = new ArrayList<>();
try { try {
list = lcJdbcTemplate.queryForList(sb.toString()); list = lcJdbcTemplate.queryForList(sb.toString());
} catch (DataAccessException e) { } catch (DataAccessException e) {