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 @@ db/*.sql domain/** - - logback-spring.xml 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 params, HttpServletResponse response) throws Exception { params.put("export", true); List 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); } 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 @@ *.json db/*.sql domain/** - logback-spring.xml application-bt.yml @@ -66,7 +65,6 @@ true ${file.separator}config - 0755