zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部门排序

main
zhaokai 2025-11-26 14:55:53 +08:00
parent efee0d58ce
commit 56b2d17949
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
View File

@ -54,7 +54,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
public List<DepartmentDO> listTree(Map<String, Object> parmas) { public List<DepartmentDO> listTree(Map<String, Object> parmas) {
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("dep_order"); queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper); List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
if (CollUtil.isEmpty(departmentDOList)) { if (CollUtil.isEmpty(departmentDOList)) {
return Collections.emptyList(); return Collections.emptyList();
@ -67,7 +67,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas); IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper); List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
return departmentDOList; return departmentDOList;
} }
@ -77,7 +77,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas); IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
return departmentMapper.selectCount(queryWrapper); return departmentMapper.selectCount(queryWrapper);
} }

2
web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.zcloud.basic.info.persistence.mapper.DepartmentMapper"> <mapper namespace="com.zcloud.basic.info.persistence.mapper.DepartmentMapper">
<select id="listAllTree" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO"> <select id="listAllTree" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
select * from department where delete_enum = 'FALSE' select * from department where delete_enum = 'FALSE' order by dep_order, create_time desc
</select> </select>
</mapper> </mapper>