diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java index 90a0c4c..5879ad5 100644 --- a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java +++ b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java @@ -53,7 +53,7 @@ class DeptServiceImpl implements IDeptService { List DeptList = deptMapper.selectList(new QueryWrapper() .gt("pid", 0) .eq("is_delete", 0) - .orderByDesc((Arrays.asList("sort", "id")))); + .orderByAsc((Arrays.asList("sort", "id")))); List list = new ArrayList<>(); for (Dept dept : DeptList) { @@ -79,7 +79,7 @@ class DeptServiceImpl implements IDeptService { public JSONArray list(DeptSearchValidate searchValidate) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + queryWrapper.orderByAsc(Arrays.asList("sort", "id")); queryWrapper.select(Dept.class, info -> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")); @@ -93,7 +93,7 @@ class DeptServiceImpl implements IDeptService { List dictDataList = dictDataMapper.selectList(new QueryWrapper() .select("id,type_id,name,value,remark,sort,status,create_time,update_time") .eq("type_id", AppConstants.DEPT_TYPE_CATEGORY)//机构类型 - .eq("is_delete", 0).orderByDesc("sort")); + .eq("is_delete", 0).orderByAsc("sort")); List list = new LinkedList<>(); for (Dept dept : DeptList) { @@ -126,18 +126,18 @@ class DeptServiceImpl implements IDeptService { @Override public List listThree(Integer secondDeptId) { - return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, Objects.nonNull(secondDeptId) ? secondDeptId : AdminThreadLocal.getDeptId()).eq(Dept::getLevel, 3)); + return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, Objects.nonNull(secondDeptId) ? secondDeptId : AdminThreadLocal.getDeptId()).eq(Dept::getLevel, 3).orderByAsc(Dept::getCategory)); } @Override public List listByThree() { DeptVo deptVo = detail(AdminThreadLocal.getDeptId()); - return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, deptVo.getPid()).eq(Dept::getLevel, 3)); + return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, deptVo.getPid()).eq(Dept::getLevel, 3).orderByAsc(Dept::getCategory)); } @Override public List listCountersign() { - return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, AdminThreadLocal.getDeptId())); + return deptMapper.selectList(new LambdaQueryWrapper().eq(Dept::getPid, AdminThreadLocal.getDeptId()).orderByAsc(Dept::getCategory)); } /**