From 23d0f1c11ce991684b19ee8285abe571c5322f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=BD=A9=E8=99=B9?= <915423200@qq.com>
Date: Thu, 23 Dec 2021 09:32:37 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E5=A4=B4=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=97=A0=E6=B3=95=E7=A1=AE=E5=AE=9A=E6=88=96=E5=A4=AA?=
 =?UTF-8?q?=E9=95=BF=EF=BC=8C=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=88=97=E4=B8=8B?=
 =?UTF-8?q?=E6=A0=87=E5=AF=B9=E5=BA=94=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/annotation/Excel.java     | 5 +++++
 .../java/com/ruoyi/common/core/domain/entity/SysUser.java    | 2 +-
 .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java  | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index 9fb64da1a..5e0f081e8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -51,6 +51,11 @@ public @interface Excel
      */
     public int scale() default -1;
 
+    /**
+     * index 下标 默认:-1(默认不开启下标)
+     */
+    public int index() default -1;
+
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 4aa1d2b2d..1756f01e7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -24,7 +24,7 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号", index = 0)
     private Long userId;
 
     /** 部门ID */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 93a19e870..93e88216a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -277,6 +277,8 @@ public class ExcelUtil<T>
                 if (column != null)
                 {
                     fieldsMap.put(column, objects);
+                } else if(attr.index != -1){
+                    fieldsMap.put(attr.index, objects);
                 }
             }
             for (int i = titleNum + 1; i <= rows; i++)