From 29a620eb419f5003db2ed166dcb6143b05137c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=8F=E7=8E=8B=E5=AD=90?= Date: Mon, 26 Feb 2024 17:24:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=A0=91=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);