wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev

This commit is contained in:
dinggang 2022-12-28 18:09:49 +08:00
parent 18bb1799d9 522f4066cf
commit 091186a0e8
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/pom.xml
View File

@ -353,8 +353,6 @@
<!-- 排除flyway管理的sql --> <!-- 排除flyway管理的sql -->
<exclude>db/*.sql</exclude> <exclude>db/*.sql</exclude>
<exclude>domain/**</exclude> <exclude>domain/**</exclude>
<!-- 日志配置文件 -->
<exclude>logback-spring.xml</exclude>
</excludes> </excludes>
</resource> </resource>
<resource> <resource>

7
renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
View File

@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; 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 { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
params.put("export", true); params.put("export", true);
List<SysUserDTO> list = sysUserService.list(params); 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); ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
} }

2
renren-admin/src/main/resources/assembly/assembly.xml
View File

@ -52,7 +52,6 @@
<include>*.json</include> <include>*.json</include>
<include>db/*.sql</include> <include>db/*.sql</include>
<include>domain/**</include> <include>domain/**</include>
<include>logback-spring.xml</include>
</includes> </includes>
<excludes> <excludes>
<exclude>application-bt.yml</exclude> <exclude>application-bt.yml</exclude>
@ -66,7 +65,6 @@
</excludes> </excludes>
<filtered>true</filtered> <filtered>true</filtered>
<outputDirectory>${file.separator}config</outputDirectory> <outputDirectory>${file.separator}config</outputDirectory>
<fileMode>0755</fileMode>
</fileSet> </fileSet>
<!-- 将target目录下的启动jar打包到目录下--> <!-- 将target目录下的启动jar打包到目录下-->