feat: fix bug about Permission.Model

object/enforcer.go

@@ -366,7 +366,7 @@ func (enforcer *Enforcer) LoadModelCfg() error {
 		return nil
 	}
 
-	model, err := GetModelEx(enforcer.Model)
+	model, err := getModelEx(enforcer.Model)
 	if err != nil {
 		return err
 	} else if model == nil {

object/model.go

@@ -87,11 +87,12 @@ func GetModel(id string) (*Model, error) {
 	return getModel(owner, name)
 }
 
-func GetModelEx(id string) (*Model, error) {
+func getModelEx(id string) (*Model, error) {
 	owner, name, err := util.GetOwnerAndNameFromIdWithError(id)
 	if err != nil {
 		return nil, err
 	}
+
 	model, err := getModel(owner, name)
 	if err != nil {
 		return nil, err

object/permission.go

@@ -148,7 +148,7 @@ func UpdatePermission(id string, permission *Permission) (bool, error) {
 	}
 
 	if permission.ResourceType == "Application" && permission.Model != "" {
-		model, err := GetModelEx(util.GetId(permission.Owner, permission.Model))
+		model, err := getModelEx(permission.Model)
 		if err != nil {
 			return false, err
 		} else if model == nil {

object/permission_enforcer.go

@@ -90,7 +90,7 @@ func (p *Permission) setEnforcerAdapter(enforcer *casbin.Enforcer) error {
 }
 
 func (p *Permission) setEnforcerModel(enforcer *casbin.Enforcer) error {
-	permissionModel, err := getModel(p.Owner, p.Model)
+	permissionModel, err := GetModel(p.Model)
 	if err != nil {
 		return err
 	}