From f250aff22f34bfe44a756bbce7033844d86436db Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 12 Dec 2022 20:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sso/permission/service/impl/DataPermissionServiceImpl.java | 2 +- .../src/main/java/org/nl/sso/permission/wql/Query.wql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/permission/service/impl/DataPermissionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/sso/permission/service/impl/DataPermissionServiceImpl.java index a3425c468..cbd5ff248 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/permission/service/impl/DataPermissionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/sso/permission/service/impl/DataPermissionServiceImpl.java @@ -43,7 +43,7 @@ public class DataPermissionServiceImpl implements DataPermissionService { @Override public Map queryAll(Map whereJson, Pageable page){ WQLObject wo = WQLObject.getWQLObject("sys_data_permission"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "order_sort desc"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "order_soe desc"); final JSONObject json = rb.pageResult(); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/sso/permission/wql/Query.wql b/lms/nladmin-system/src/main/java/org/nl/sso/permission/wql/Query.wql index eeb602f3f..3cf3c1f60 100644 --- a/lms/nladmin-system/src/main/java/org/nl/sso/permission/wql/Query.wql +++ b/lms/nladmin-system/src/main/java/org/nl/sso/permission/wql/Query.wql @@ -98,7 +98,7 @@ permission.permission_id FROM `sys_data_scope` scop - LEFT JOIN sys_user_data_permission permission ON scop.permission_scope_type = permission.permission_scope_type + LEFT JOIN sys_user_data_permission permission ON scop.permission_scope_type = permission.permission_scope_type AND permission.user_id = scop.self_user_id LEFT JOIN sys_data_permission dp ON permission.permission_id = dp.permission_id LEFT JOIN sys_dept dept ON scop.dept_id = dept.dept_id LEFT JOIN sys_user user ON scop.user_id = user.user_id