From 2d514c0db07d5836f96d4bb6d1905a3010f855c8 Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Thu, 2 Feb 2023 16:09:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=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

---
 apps/rbac/migrations/0012_alter_role_options.py | 2 +-
 apps/rbac/models/role.py                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rbac/migrations/0012_alter_role_options.py b/apps/rbac/migrations/0012_alter_role_options.py
index ba98b699e..6c7ce1525 100644
--- a/apps/rbac/migrations/0012_alter_role_options.py
+++ b/apps/rbac/migrations/0012_alter_role_options.py
@@ -12,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='role',
-            options={'ordering': ('scope', 'name'), 'verbose_name': 'Role'},
+            options={'ordering': ('-builtin', 'scope', 'name'), 'verbose_name': 'Role'},
         ),
     ]
diff --git a/apps/rbac/models/role.py b/apps/rbac/models/role.py
index e5a18b5e6..796b1ab63 100644
--- a/apps/rbac/models/role.py
+++ b/apps/rbac/models/role.py
@@ -43,7 +43,7 @@ class Role(JMSBaseModel):
 
     class Meta:
         unique_together = [('name', 'scope')]
-        ordering = ('scope', 'name')
+        ordering = ('-builtin', 'scope', 'name')
         verbose_name = _('Role')
 
     def __str__(self):