Merge pull request #52 from ArtisanCloud/develop

refact(rbac): sort permission module by id asc
ArtisanCloud · Nov 10, 2022 · 297431b · 297431b
2 parents 3fe386c + 5912dcf
commit 297431b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/authorization/rbac/models/module.go b/authorization/rbac/models/module.go
@@ -45,6 +45,9 @@ func NewPermissionModule(mapObject *object.Collection) *PermissionModule {
 	newPermissionModule := &PermissionModule{
 		PowerCompactModel: database.NewPowerCompactModel(),
 		Name:              mapObject.GetString("name", ""),
+		URI:               mapObject.GetString("uri", ""),
+		Component:         mapObject.GetString("component", ""),
+		Icon:              mapObject.GetString("icon", ""),
 		Description:       mapObject.GetString("description", ""),
 		ParentID:          mapObject.GetStringPointer("parentID", ""),
 	}

diff --git a/database/model.go b/database/model.go
@@ -241,6 +241,7 @@ func GetAllList(db *gorm.DB, conditions *map[string]interface{},
 	// chunk datas
 	result := db.
 		//Debug().
+		Order("id ASC").
 		Find(items)
 	err = result.Error
 	if err != nil {