feat:完善项目信息
This commit is contained in:
@ -3,8 +3,7 @@ package user
|
||||
import (
|
||||
"SciencesServer/app/api/admin/controller"
|
||||
menu2 "SciencesServer/app/api/admin/controller/menu"
|
||||
model3 "SciencesServer/app/api/admin/model"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/api/admin/model"
|
||||
"SciencesServer/app/service"
|
||||
)
|
||||
|
||||
@ -14,23 +13,24 @@ type MenuHandle func(session *service.Session) *Menu
|
||||
|
||||
// List 菜单列表
|
||||
func (c *Menu) List() (interface{}, error) {
|
||||
mSysMenu := model3.NewSysMenu()
|
||||
mSysMenu := model.NewSysMenu()
|
||||
|
||||
if c.IsAdmin {
|
||||
return menu2.MenuForSystem(mSysMenu)
|
||||
}
|
||||
mSysUserTenant := model3.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)
|
||||
//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
|
||||
}
|
||||
|
||||
func NewMenu() MenuHandle {
|
||||
|
Reference in New Issue
Block a user