From 3e7cbc64d4c02b8fdddd18babf14fc6bc9b30525 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 3 Sep 2024 18:30:07 +0800 Subject: [PATCH] add some --- src/gonganxitong/common.go | 7 ++++++- src/gonganxitong/model/model.go | 1 + src/gonganxitong/template/common.go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gonganxitong/common.go b/src/gonganxitong/common.go index 8d3befa..d35cbb3 100644 --- a/src/gonganxitong/common.go +++ b/src/gonganxitong/common.go @@ -81,6 +81,10 @@ func (s Table) Inputs(m *ice.Message, arg ...string) { if m.IsDebug() { m.Push(arg[0], "云境互联") } + case model.SCHOOL_NAME: + if m.IsDebug() { + m.Push(arg[0], "深圳中学") + } default: s.Table.Inputs(m, arg...) } @@ -345,6 +349,7 @@ func NewPortal(userPlace UserPlacer, place Placer, street Container) Portal { return Portal{Table: Table{UserPlace: userPlace, Place: place, Street: street}} } func (s Portal) getTable() Table { return s.Table } + func PortalCmd(portal ice.Any) { h := kit.FileLine(-1, 100) p := kit.Keys("web.team", kit.ModPath(-1)) @@ -352,7 +357,7 @@ func PortalCmd(portal ice.Any) { _, cmd := ice.Cmd(kit.Keys(p, name), data) cmd.RawHand = path.Join(path.Dir(h), name+".go") cmd.Actions[ice.CTX_INIT].Hand = icebergs.MergeHand(func(m *icebergs.Message, arg ...string) { - mdb.Config(m, db.DOMAIN, "gonganxitong") + mdb.Config(m, db.DOMAIN, kit.PathName(1)) }, cmd.Actions[ice.CTX_INIT].Hand) } table := portal.(interface{ getTable() Table }).getTable() diff --git a/src/gonganxitong/model/model.go b/src/gonganxitong/model/model.go index abeb36e..72950bc 100644 --- a/src/gonganxitong/model/model.go +++ b/src/gonganxitong/model/model.go @@ -28,6 +28,7 @@ const ( PLACE_ADDRESS = "place_address" STREET_UID = "street_uid" STREET_NAME = "street_name" + SCHOOL_NAME = "school_name" COMPANY_NAME = "company_name" CITY_UID = "city_uid" CITY_NAME = "city_name" diff --git a/src/gonganxitong/template/common.go b/src/gonganxitong/template/common.go index 1bf2ac8..e55db08 100644 --- a/src/gonganxitong/template/common.go +++ b/src/gonganxitong/template/common.go @@ -36,7 +36,7 @@ func (s Table) RewriteAppend(m *ice.Message, arg ...string) *ice.Message { return s.Table.RewriteAppend(m) } func (s Table) CheckRole(m *ice.Message, arg ...string) *ice.Message { - role := User{{.Option "Class"}}Role(kit.Int(m.Cmd(user{{.Option "Class"}}{}, s.Select, m.OptionSimple(model.{{.Option "CLASS"}}_UID, model.USER_UID)).Append(model.ROLE))) + role := User{{.Option "Class"}}Role(s.UserPlaceRole(m)) m.WarnNotRight(!kit.IsIn(role.String(), append(arg, User{{.Option "Class"}}Creator.String())...), role.String()) return m }