From 0c8b2f1f57a378e85651a522f27d8fb51c91b8a5 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 21 Jun 2022 19:34:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/excel/ResourceExcelImportListener.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/excel/ResourceExcelImportListener.java b/renren-admin/src/main/java/io/renren/modules/resource/excel/ResourceExcelImportListener.java
index 8ed5d3f2..56fe3f04 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/excel/ResourceExcelImportListener.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/excel/ResourceExcelImportListener.java
@@ -338,7 +338,7 @@ public class ResourceExcelImportListener extends AnalysisEventListener<Map<Integ
 
                 AttrEntity attrEntity = new AttrEntity();
                 attrEntity.setAttrType("文件类型");
-                attrEntity.setAttrValue(date.get(6));
+                attrEntity.setAttrValue(date.get(5));
 
                 infoList.add(attrEntity);
 

From e057a5550cc96b2e59e7a81a4479738c78c92781 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 21 Jun 2022 19:59:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=80=BB=E5=BA=94=E7=94=A8=E6=95=B0?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/renren/common/controller/CensusControllerV2.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
index e4d545f7..cfdf9fd8 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
@@ -116,7 +116,7 @@ public class CensusControllerV2 {
         List<Map<String, Object>> result = new CopyOnWriteArrayList<>();
 
         CompletableFuture<Void> allApplicationAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总应用数目
-            return jdbcTemplate.queryForObject("SELECT COUNT(id) FROM tb_data_resource WHERE type ='应用资源';", Long.class);
+            return jdbcTemplate.queryForObject("SELECT COUNT(id) FROM tb_data_resource WHERE type ='应用资源' AND del_flag = 0;", Long.class);
         }).thenAccept(sum -> {
             result.add(new HashMap<String, Object>() {
                 {