diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 2101965..266550d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -73,7 +73,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl .and(SYS_DEPT.PARENT_ID.eq(deptBo.getParentId())) .and(SYS_DEPT.DEPT_NAME.like(deptBo.getDeptName())) .and(SYS_DEPT.STATUS.eq(deptBo.getStatus())) - .orderBy(SYS_DEPT.PARENT_ID.asc(), SYS_DEPT.ORDER_NUM.asc()); + .orderBy(SYS_DEPT.ANCESTORS.asc(), SYS_DEPT.PARENT_ID.asc(), SYS_DEPT.ORDER_NUM.asc()); return queryWrapper; } @@ -148,7 +148,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl if (ObjectUtil.isNotNull(role.getDeptCheckStrictly()) && role.getDeptCheckStrictly().equals(true)) { queryWrapper.and(SYS_DEPT.DEPT_ID.notIn(select(SYS_DEPT.PARENT_ID).from(SYS_DEPT).innerJoin(SYS_ROLE_DEPT).on(SYS_ROLE_DEPT.DEPT_ID.eq(SYS_DEPT.DEPT_ID).and(SYS_ROLE_DEPT.ROLE_ID.eq(roleId))))); } - queryWrapper.orderBy(SYS_DEPT.PARENT_ID.asc(), SYS_DEPT.ORDER_NUM.asc()); + queryWrapper.orderBy(SYS_DEPT.ANCESTORS.asc(), SYS_DEPT.PARENT_ID.asc(), SYS_DEPT.ORDER_NUM.asc()); return this.listAs(queryWrapper, Long.class);