From d403b27c5f146d169de1a6541f034bdaeb2960f0 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Thu, 15 Dec 2022 16:43:19 +0800
Subject: [PATCH] ..

---
 .../io/renren/modules/gateway/controller/MonitorController.java | 2 +-
 .../modules/resource/service/impl/ResourceServiceImpl.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java
index 2df9b4b6..0f0d6d7b 100644
--- a/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java
+++ b/renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorController.java
@@ -287,8 +287,8 @@ public class MonitorController {
                 "&start=" + start +
                 "&end=" + end +
                 "&step=" + step;
-
         ResponseEntity<HashMap> entity = restTemplate.getForEntity(url, HashMap.class, query);
+
         HashMap body = entity.getBody();
         HashMap data = (HashMap) body.get("data");
         if (data != null) {
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 58b49478..f6139e08 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -2874,7 +2874,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             sb.append(" AND apply.\"resourceName\" LIKE '%" + params.get("resourceName").toString() + "%'");
         }
         sb.append(" ORDER BY apply.\"createDate\" DESC");
-        List<Map<String, Object>> list = null;
+        List<Map<String, Object>> list = new ArrayList<>();
         try {
             list = lcJdbcTemplate.queryForList(sb.toString());
         } catch (DataAccessException e) {