From 02329d342ad716667365ab93f1bdc4489f0cdb25 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Fri, 22 Dec 2023 14:16:00 +0800
Subject: [PATCH] feat: fix bug in "*" users and roles in permission edit page.

---
 object/permission.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/object/permission.go b/object/permission.go
index f28a580f..1201ddf4 100644
--- a/object/permission.go
+++ b/object/permission.go
@@ -470,6 +470,10 @@ func (p *Permission) GetModelAndAdapter() string {
 func (p *Permission) isUserHit(name string) bool {
 	targetOrg, targetName := util.GetOwnerAndNameFromId(name)
 	for _, user := range p.Users {
+		if user == "*" {
+			return true
+		}
+
 		userOrg, userName := util.GetOwnerAndNameFromId(user)
 		if userOrg == targetOrg && (userName == "*" || userName == targetName) {
 			return true
@@ -483,9 +487,14 @@ func (p *Permission) isRoleHit(userId string) bool {
 	if err != nil {
 		return false
 	}
+
 	for _, role := range p.Roles {
+		if role == "*" {
+			return true
+		}
+
 		for _, targetRole := range targetRoles {
-			if targetRole.GetId() == role {
+			if role == targetRole.GetId() {
 				return true
 			}
 		}