From 3f6b2c340b26cb7b35b26a64e54a71abd23df127 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 29 Jun 2022 18:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/hrmresource/vo/HrmResourceVO.java             | 9 +++++++--
 src/com/engine/organization/util/excel/ExcelUtil.java    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java
index a23c5e4e..40bbce2a 100644
--- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java
+++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java
@@ -23,9 +23,11 @@ import lombok.NoArgsConstructor;
                 "t.company_id," +
                 "t.mobile," +
                 "t.telephone," +
-                "t.manager_id ",
+                "t.manager_id, " +
+                "t.show_order ",
         fromSql = "FROM jcl_org_hrmresource t ",
-        orderby = " id ",
+        orderby = " show_order ",
+        sortway = " asc",
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(index = "0", text = "发消息"),
@@ -75,4 +77,7 @@ public class HrmResourceVO {
      */
     @OrganizationTableColumn(text = "直接上级", width = "25%", column = "manager_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName")
     private String managerName;
+
+    @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "show_order", orderkey = "show_order")
+    private Integer showOrder;
 }
diff --git a/src/com/engine/organization/util/excel/ExcelUtil.java b/src/com/engine/organization/util/excel/ExcelUtil.java
index 2911cb7d..0a9f0acc 100644
--- a/src/com/engine/organization/util/excel/ExcelUtil.java
+++ b/src/com/engine/organization/util/excel/ExcelUtil.java
@@ -93,7 +93,7 @@ public class ExcelUtil {
         //自适应宽度
         sheet.autoSizeColumn(0, true);
         //默认列宽
-        sheet.setDefaultColumnWidth(100);
+        sheet.setDefaultColumnWidth(25);
         //默认行高
         sheet.setDefaultRowHeightInPoints(18);