feat:完善项目信息
This commit is contained in:
@ -1,8 +1,9 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
menu2 "SciencesServer/app/api/admin/controller/menu"
|
||||
"SciencesServer/app/api/admin/controller/menu"
|
||||
"SciencesServer/app/api/admin/model"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
)
|
||||
|
||||
@ -10,26 +11,22 @@ type Menu struct{ *session.Admin }
|
||||
|
||||
type MenuHandle func(session *session.Admin) *Menu
|
||||
|
||||
// List 菜单列表
|
||||
func (c *Menu) List() (interface{}, error) {
|
||||
// Index 菜单列表
|
||||
func (c *Menu) Index() ([]*menu.Tree, error) {
|
||||
mSysMenu := model.NewSysMenu()
|
||||
|
||||
if c.IsAdmin {
|
||||
return menu2.MenuForSystem(mSysMenu)
|
||||
kinds := []model2.SysMenuKind{
|
||||
model2.SysMenuKindForCatalogue,
|
||||
model2.SysMenuKindForMenu,
|
||||
}
|
||||
//mSysUserTenant := model.NewSysUserTenant()
|
||||
//
|
||||
//if isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "identity"},
|
||||
// model2.NewWhere("tenant_id", c.TenantID), model2.NewWhere("uid", c.UID)); err != nil {
|
||||
// return nil, err
|
||||
//} else if !isExist {
|
||||
// return nil, nil
|
||||
//}
|
||||
//if mSysUserTenant.Identity == model2.SysUserTenantIdentityForSystemAdmin {
|
||||
// return menu2.MenuForTenant(mSysMenu, c.TenantID)
|
||||
//}
|
||||
//return menu2.MenuForUser(mSysMenu, c.TenantID, c.UID)
|
||||
return nil, nil
|
||||
|
||||
if c.IsAdmin {
|
||||
if c.TenantID > 0 {
|
||||
return menu.MenuForTenant(mSysMenu, c.TenantID, model2.NewWhereIn("m.kind", kinds))
|
||||
}
|
||||
return menu.MenuForSystem(mSysMenu, model2.NewWhereIn("kind", kinds))
|
||||
}
|
||||
return menu.MenuForUser(mSysMenu, c.TenantID, c.UID, model2.NewWhereIn("m.kind", kinds))
|
||||
}
|
||||
|
||||
func NewMenu() MenuHandle {
|
||||
|
Reference in New Issue
Block a user