部门排序
parent
efee0d58ce
commit
56b2d17949
|
|
@ -54,7 +54,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
|
|||
public List<DepartmentDO> listTree(Map<String, Object> parmas) {
|
||||
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
|
||||
queryWrapper.orderByDesc("dep_order");
|
||||
queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
|
||||
List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
|
||||
if (CollUtil.isEmpty(departmentDOList)) {
|
||||
return Collections.emptyList();
|
||||
|
|
@ -67,7 +67,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
|
|||
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
|
||||
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
|
||||
List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
|
||||
return departmentDOList;
|
||||
}
|
||||
|
|
@ -77,7 +77,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
|
|||
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
|
||||
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
|
||||
return departmentMapper.selectCount(queryWrapper);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<mapper namespace="com.zcloud.basic.info.persistence.mapper.DepartmentMapper">
|
||||
|
||||
<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>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue