ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-04 10:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from Bull-BCLS/dev

Browse Source 
fix: 修复查询数据库表按修改时间排序时，修改时间为空导致的 NPE 问题
This commit is contained in:
Charles7c
2023-08-29 10:06:19 +08:00
committed by GitHub
parent bb398d8101 25aac947f7
commit 2b316d1685
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
View File

@@ -19,10 +19,7 @@ package top.charles7c.cnadmin.tool.service.impl;
import java.io.File; import java.io.File;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Collection; import java.util.*;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -91,7 +88,9 @@ public class GeneratorServiceImpl implements GeneratorService {
} }
tableList.removeIf(table -> StrUtil.equalsAny(table.getTableName(), generatorProperties.getExcludeTables())); tableList.removeIf(table -> StrUtil.equalsAny(table.getTableName(), generatorProperties.getExcludeTables()));
CollUtil.sort(tableList, CollUtil.sort(tableList,
Comparator.comparing(Table::getCreateTime).thenComparing(Table::getUpdateTime).reversed()); Comparator.comparing(Table::getCreateTime)
.thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime()))
.reversed());
List<TableVO> tableVOList = BeanUtil.copyToList(tableList, TableVO.class); List<TableVO> tableVOList = BeanUtil.copyToList(tableList, TableVO.class);
PageDataVO<TableVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), tableVOList); PageDataVO<TableVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), tableVOList);
for (TableVO tableVO : pageDataVO.getList()) { for (TableVO tableVO : pageDataVO.getList()) {