From 64b44da8598821deb6674fb0ad3e00204cf3255b Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 16 Jun 2022 15:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E5=A4=B4=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/excel/ResourceExcelImportListener.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 9d319b04..15271aaa 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
@@ -320,7 +320,7 @@ public class ResourceExcelImportListener extends AnalysisEventListener<Map<Integ
 
                 infoList.add(attrEntity);
 
-                this.headMap.keySet().stream().skip(6).forEach(key -> { // 表头后6个
+                this.headMap.keySet().stream().sorted().skip(6).forEach(key -> { // 表头后6个
                     AttrEntity attrEntity_ = new AttrEntity();
                     attrEntity_.setAttrType(this.headMap.get(key));
                     attrEntity_.setAttrValue(date.get(key));
@@ -332,7 +332,7 @@ public class ResourceExcelImportListener extends AnalysisEventListener<Map<Integ
                 resourceDTO.setType("基础设施");
                 resourceDTO.setName(date.get(0));
 
-                this.headMap.keySet().stream().skip(1).forEach(key -> { // 表头后1个
+                this.headMap.keySet().stream().sorted().skip(1).forEach(key -> { // 表头后1个
                     AttrEntity attrEntity_ = new AttrEntity();
                     attrEntity_.setAttrType(this.headMap.get(key));
                     attrEntity_.setAttrValue(date.get(key));