From 142ff089aa7b5b5685887df0a72915a960edd9ef Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 3 Apr 2023 16:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=BF=80=E6=B4=BB=20?=
 =?UTF-8?q?=E5=92=8C=E6=89=8B=E5=8A=A8=E6=BF=80=E6=B4=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sys/model_sys.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index 279d7e4ee..7a5b95c91 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -29,12 +29,21 @@ func (this *ModelSys) Init(service core.IService, module core.IModule, comp core
 func (this *ModelSys) IsAccess(funName string, uid string) (code pb.ErrorCode) {
 	user := this.moduleSys.ModuleUser.GetUser(uid)
 	if user != nil {
-		conf := this.moduleSys.configure.getFuncCfg(funName)
-		if conf != nil {
-			this.validCond(uid, conf)
+		if conf := this.moduleSys.configure.getFuncCfg(funName); conf != nil {
+			if conf.ActivateType == 1 { // 已经手动激活过
+				list, _ := this.GetOpenCondList(uid)
+				if v, ok := list.Cond[funName]; ok && v == 1 {
+					return
+				}
+			} else {
+				if id := this.validCond(uid, conf); id != "" { // 条件满足已经激活
+					return
+				}
+			}
+
 		}
 	}
-
+	code = pb.ErrorCode_OpenCondErr
 	return
 }