Merge branch 'main' into frx
This commit is contained in:
commit
c3e65b3f4e
@ -64,7 +64,7 @@
|
||||
SELECT
|
||||
role.id, role.data_scope, role.data_scope_dept_ids
|
||||
FROM
|
||||
( SELECT role_id FROM system_role_menu a LEFT JOIN system_menu role ON a.menu_id = role.id WHERE role.permission = 'system:view-log:query' AND a.role_id != 1 ) menu
|
||||
( SELECT role_id FROM system_role_menu a LEFT JOIN system_menu role ON a.menu_id = role.id WHERE role.permission = 'system:view-log:query' AND a.role_id != 1 AND a.role_id != 101 ) menu
|
||||
LEFT JOIN system_role role on role.id = menu.role_id
|
||||
) role_id ON u_role.role_id = role_id.id
|
||||
WHERE u_role.deleted = 0
|
||||
|
Loading…
Reference in New Issue
Block a user