diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index 35881ad8b..1aab61341 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -338,7 +338,7 @@ public class DeptServiceImpl extends ServiceImpl implements ID LambdaQueryWrapper deptLambdaQueryWrapper = new LambdaQueryWrapper<>(); deptLambdaQueryWrapper .eq(Dept::getName, deptParam.getName()) - .eq(Dept::getState, DataStateEnum.ENABLE.getCode()); + .eq(Dept::getState, DataStateEnum.ENABLE.getCode()).orderByAsc(Dept::getSort); //更新的时候,需排除当前记录 if (isExcludeSelf) { if (deptParam instanceof DeptParam.DeptUpdateParam) { @@ -427,24 +427,30 @@ public class DeptServiceImpl extends ServiceImpl implements ID @Override public List getDirectSonSelf(String deptId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.and(wrapper -> wrapper. - eq(Dept::getPid, deptId). - or(). - eq(Dept::getId, deptId)).eq(Dept::getState, DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.and(wrapper -> wrapper + .eq(Dept::getPid, deptId) + .or() + .eq(Dept::getId, deptId)).eq(Dept::getState, DataStateEnum.ENABLE.getCode()) + .orderByAsc(Dept::getSort) + ; return this.list(lambdaQueryWrapper); } @Override public List getSpecialDeptList() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Dept::getSpecialType, 1).eq(Dept::getState, DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper + .eq(Dept::getSpecialType, 1) + .eq(Dept::getState, DataStateEnum.ENABLE.getCode()) + .orderByAsc(Dept::getSort) + ; return this.list(lambdaQueryWrapper); } @Override public Dept getRootDept() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Dept::getState, DataStateEnum.ENABLE.getCode()).eq(Dept::getPid, '0'); + lambdaQueryWrapper.eq(Dept::getState, DataStateEnum.ENABLE.getCode()).eq(Dept::getPid, '0').orderByAsc(Dept::getSort); return this.getOne(lambdaQueryWrapper); } @@ -458,7 +464,8 @@ public class DeptServiceImpl extends ServiceImpl implements ID LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Dept::getPid, deptId). - eq(Dept::getState, DataStateEnum.ENABLE.getCode()); + eq(Dept::getState, DataStateEnum.ENABLE.getCode()) + .orderByAsc(Dept::getSort); result = this.baseMapper.selectList(lambdaQueryWrapper); if (CollectionUtils.isEmpty(result)) { LambdaQueryWrapper deptLambdaQueryWrapper = new LambdaQueryWrapper<>();