From 81b5b28743a9b283c327f70271ed434f8d2e5a0b Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Fri, 22 Jul 2022 14:43:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=91=E5=AE=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83-=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=9B=BE=E8=B0=B1-=E8=83=BD=E5=8A=9B=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B-=E8=83=BD=E5=8A=9B=E9=9B=86-=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E6=9F=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/renren/common/controller/CensusController.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/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index 1c78a1ca..9b8183a4 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -308,7 +308,7 @@ public class CensusController {
                     } catch (JsonProcessingException e) {
                         throw new RuntimeException(e);
                     }
-                }).reversed().thenComparing(i -> i.toString())
+                }).reversed().thenComparing(Object::toString)
         ); // 按应用领域数目逆序排序
         return new Result<List<Map<String, Object>>>().ok(result);
     }
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 bc2188c8..f168e1e8 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
@@ -1077,7 +1077,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             return resourceList;
         } else if ("数据资源".equals(type)) {
             GetDataResourceListDto dto = new GetDataResourceListDto();
-            dto.setPageNum(0);
+            dto.setPageNum(1);
             dto.setPageSize(30);
             Optional<AbstractDataResourceService> factory = DataResourceFactory.build();
             if (factory.isPresent()) {