部门列表按类型或按照排序字段排序

mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java

@@ -53,7 +53,7 @@ class DeptServiceImpl implements IDeptService {
         List<Dept> DeptList = deptMapper.selectList(new QueryWrapper<Dept>()
                 .gt("pid", 0)
                 .eq("is_delete", 0)
-                .orderByDesc((Arrays.asList("sort", "id"))));
+                .orderByAsc((Arrays.asList("sort", "id"))));
 
         List<DeptVo> list = new ArrayList<>();
         for (Dept dept : DeptList) {
@@ -79,7 +79,7 @@ class DeptServiceImpl implements IDeptService {
     public JSONArray list(DeptSearchValidate searchValidate) {
         QueryWrapper<Dept> 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<DictData> dictDataList = dictDataMapper.selectList(new QueryWrapper<DictData>()
                 .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<DeptVo> list = new LinkedList<>();
         for (Dept dept : DeptList) {
@@ -126,18 +126,18 @@ class DeptServiceImpl implements IDeptService {
 
     @Override
     public List<Dept> listThree(Integer secondDeptId) {
-        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, Objects.nonNull(secondDeptId) ? secondDeptId : AdminThreadLocal.getDeptId()).eq(Dept::getLevel, 3));
+        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, Objects.nonNull(secondDeptId) ? secondDeptId : AdminThreadLocal.getDeptId()).eq(Dept::getLevel, 3).orderByAsc(Dept::getCategory));
     }
 
     @Override
     public List<Dept> listByThree() {
         DeptVo deptVo = detail(AdminThreadLocal.getDeptId());
-        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, deptVo.getPid()).eq(Dept::getLevel, 3));
+        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, deptVo.getPid()).eq(Dept::getLevel, 3).orderByAsc(Dept::getCategory));
     }
 
     @Override
     public List<Dept> listCountersign() {
-        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, AdminThreadLocal.getDeptId()));
+        return deptMapper.selectList(new LambdaQueryWrapper<Dept>().eq(Dept::getPid, AdminThreadLocal.getDeptId()).orderByAsc(Dept::getCategory));
     }
 
     /**