diff --git a/src/service/system_user.go b/src/service/system_user.go index 29e3e7813bcbe617bff214a4c6eab73e8f380e95..82346f3a0510c414b3e577f2062d3e8334290eac 100644 --- a/src/service/system_user.go +++ b/src/service/system_user.go @@ -78,9 +78,9 @@ func (o *User) OrgUserRoles(oid string) (interface{}, error) { } session := db.Table("system_role").Where(" is_deleted = 0 and state = 1 ") if org.DataType == 2 { - session.Where("role_type <= 2") + session.Where("role_type = 0 or role_type = 2") } else { - session.Where("role_type <= 1") + session.Where("role_type = 0 or role_type = 1") } var roles []entity.SystemRole if err := session.Find(&roles); err != nil { diff --git a/src/util/common.go b/src/util/common.go index 80ba9beaf9bf65b8a86f6b83ad82c453f672b359..d3c399cc1871124d86228ff9089b38e9990ec06e 100644 --- a/src/util/common.go +++ b/src/util/common.go @@ -11,6 +11,7 @@ package util import ( "net/http" "regexp" + "strings" "github.com/Luzifer/go-openssl/v4" "github.com/google/uuid" @@ -58,3 +59,11 @@ func GetUUID() string { // Creating UUID Version 4 return uuid.New().String() } + +func SpecialEscape(keyword string) string { + keyword = strings.Replace(keyword, "\\", "\\\\", -1) + keyword = strings.Replace(keyword, "$", "\\$", -1) + keyword = strings.Replace(keyword, "%", "\\%", -1) + keyword = strings.Replace(keyword, "_", "\\_", -1) + return keyword +}