From 61c8a2bc8aab48b7e78066c100b4387adfce1749 Mon Sep 17 00:00:00 2001 From: HuangZhi Date: Wed, 5 Jul 2023 15:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/system_user.go | 4 ++-- src/util/common.go | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/service/system_user.go b/src/service/system_user.go index 29e3e78..82346f3 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 80ba9be..d3c399c 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 +} -- 2.26.0