From 6538b0fca5a6926e9d3f4ade8e5bd683b4e208e2 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 28 Dec 2022 09:57:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 renren-admin/pom.xml                                  | 2 --
 renren-admin/src/main/resources/assembly/assembly.xml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/renren-admin/pom.xml b/renren-admin/pom.xml
index c5dc7fe0..678c6c53 100644
--- a/renren-admin/pom.xml
+++ b/renren-admin/pom.xml
@@ -353,8 +353,6 @@
                     <!-- 排除flyway管理的sql -->
                     <exclude>db/*.sql</exclude>
                     <exclude>domain/**</exclude>
-                    <!-- 日志配置文件 -->
-                    <exclude>logback-spring.xml</exclude>
                 </excludes>
             </resource>
             <resource>
diff --git a/renren-admin/src/main/resources/assembly/assembly.xml b/renren-admin/src/main/resources/assembly/assembly.xml
index e345abc6..75ae41db 100644
--- a/renren-admin/src/main/resources/assembly/assembly.xml
+++ b/renren-admin/src/main/resources/assembly/assembly.xml
@@ -52,7 +52,6 @@
                 <include>*.json</include>
                 <include>db/*.sql</include>
                 <include>domain/**</include>
-                <include>logback-spring.xml</include>
             </includes>
             <excludes>
                 <exclude>application-bt.yml</exclude>
@@ -66,7 +65,6 @@
             </excludes>
             <filtered>true</filtered>
             <outputDirectory>${file.separator}config</outputDirectory>
-            <fileMode>0755</fileMode>
         </fileSet>
 
         <!-- 将target目录下的启动jar打包到目录下-->

From 522f4066cf7cab2d44a4ac8a90e541bd171737ff Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 28 Dec 2022 14:51:42 +0800
Subject: [PATCH 2/2] fix HIQDUCS-695

---
 .../renren/modules/sys/controller/SysUserController.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
index 5954aa42..5e8be9b2 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
@@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -193,6 +190,8 @@ public class SysUserController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         params.put("export", true);
         List<SysUserDTO> list = sysUserService.list(params);
+        // HIQDUCS-695 默认导出创建时间逆序
+        list = list.stream().sorted(Comparator.comparing(SysUserDTO::getCreateDate).reversed()).collect(Collectors.toList());
         ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
     }