diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 2a95e15de..f693a0dfe 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -9,6 +9,7 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "go_dreamfactory/utils" + "time" "go.mongodb.org/mongo-driver/bson/primitive" ) @@ -410,17 +411,34 @@ func (this *Privilege) SendDailyPrivilegeMail(session comm.IUserSession, cId []i } } func (this *Privilege) GetCountByPrivilegeId(uid string, pId int32) (count int32) { - vip, err := this.modelVip.getVipList(uid) - if err != nil { - return - } - if v, ok := vip.Privilege[pId]; ok { - data := this.configure.GetPrivilegeByType(pId) - for _, v1 := range v.PrivilegeID { - if c, ok1 := data[v1]; ok1 { - count += c + if this.IsCross() { // 跨服情况 + if model, err := this.GetDBModuleByUid(uid, comm.TableVip, time.Hour); err == nil { + vip := &pb.DBVip{} + if err = model.Get(uid, vip); err == nil { + if v, ok := vip.Privilege[pId]; ok { + data := this.configure.GetPrivilegeByType(pId) + for _, v1 := range v.PrivilegeID { + if c, ok1 := data[v1]; ok1 { + count += c + } + } + } + } + } + } else { + vip, err := this.modelVip.getVipList(uid) + if err != nil { + return + } + if v, ok := vip.Privilege[pId]; ok { + data := this.configure.GetPrivilegeByType(pId) + for _, v1 := range v.PrivilegeID { + if c, ok1 := data[v1]; ok1 { + count += c + } } } } + return }