From 18fbc7fbcea53e465d9d2b928ea42cb067d8a1a7 Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 1 Sep 2024 23:45:41 +0800 Subject: [PATCH] add some --- src/guanlixitong/common.go | 8 +------- src/guanlixitong/target.go | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/guanlixitong/common.go b/src/guanlixitong/common.go index f0900bd..0a1a387 100644 --- a/src/guanlixitong/common.go +++ b/src/guanlixitong/common.go @@ -46,16 +46,10 @@ func (s Table) SelectJoinCompany(m *ice.Message) *ice.Message { return s.SelectJoin(m, company{}, model.NAME, model.CITY_UID) } func (s Table) CheckRole(m *ice.Message, arg ...string) *ice.Message { - role := UserGroupRole(kit.Int(m.Cmd(userGroup{}, s.Select, m.OptionSimple(model.GROUP_UID, model.USER_UID)).Append(model.ROLE))) + role := UserGroupRole(s.UserPlaceRole(m)) m.WarnNotRight(!kit.IsIn(role.String(), append(arg, UserGroupCreator.String())...), role.String()) return m } -func (s Table) recordEvent(m *ice.Message, info string, arg ...string) { - s.Table.RecordEvent(m, m.Option(model.GROUP_UID), info, kit.Select(m.Option(model.UID), arg, 0)) -} -func (s Table) recordEventWithName(m *ice.Message, info string) { - s.Table.RecordEventWithName(m, m.Option(model.GROUP_UID), info) -} type Tables struct{ Table } diff --git a/src/guanlixitong/target.go b/src/guanlixitong/target.go index 6068c0e..c2cc701 100644 --- a/src/guanlixitong/target.go +++ b/src/guanlixitong/target.go @@ -16,7 +16,7 @@ type target struct { func (s target) Create(m *ice.Message, arg ...string) { s.Table.Create(m, kit.Simple(arg, m.OptionSimple(model.GROUP_UID, model.USER_UID))...) - s.recordEventWithName(m, "") + s.RecordEventWithName(m, "") } func (s target) List(m *ice.Message, arg ...string) { s.TablesWithRole(m, arg, s.userGroup, s.group, s, model.TITLE, model.CONTENT).Display("")