diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index cf4a516..1c71111 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -54,7 +54,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listTree(Map parmas) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("dep_order"); + queryWrapper.orderByAsc("dep_order").orderByDesc("create_time"); List departmentDOList = departmentMapper.selectList(queryWrapper); if (CollUtil.isEmpty(departmentDOList)) { return Collections.emptyList(); @@ -67,7 +67,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByAsc("dep_order").orderByDesc("create_time"); List departmentDOList = departmentMapper.selectList(queryWrapper); return departmentDOList; } @@ -77,7 +77,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByAsc("dep_order").orderByDesc("create_time"); return departmentMapper.selectCount(queryWrapper); } diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml index 391b04c..441305f 100644 --- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml @@ -5,7 +5,7 @@