gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改菜单返回

Browse Source
This commit is contained in:
wucongxing 2023-07-04 17:46:05 +08:00
parent 10d4709f90
commit 8e783e2ea2
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/dao/adminMenu.go
View File

@ -45,6 +45,15 @@ func (r *AdminMenuDao) GetAdminMenuListNormalSortOrderNum() (m []*model.AdminMen
return m, nil
}
// GetAdminMenuListNonButtonNormalSortOrderNum 获取全部正常非按钮菜单列表-排序
func (r *AdminMenuDao) GetAdminMenuListNonButtonNormalSortOrderNum() (m []*model.AdminMenu, err error) {
err = global.Db.Where("menu_status = ?", 1).Where("menu_type != ?", 3).Order("order_num asc").Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// AddAdminMenu 新增菜单
func (r *AdminMenuDao) AddAdminMenu(tx *gorm.DB, model *model.AdminMenu) (*model.AdminMenu, error) {
if err := tx.Create(model).Error; err != nil {

2
api/service/menu.go
View File

@ -17,7 +17,7 @@ type MenuService struct{}
func (r *MenuService) GetMenuList() ([]*menuResponse.GetMenuList, error) {
// 获取全部菜单
AdminMenuDao := dao.AdminMenuDao{}
adminMenu, _ := AdminMenuDao.GetAdminMenuListSortOrderNum()
adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
if adminMenu == nil {
return nil, nil
}

4
api/service/role.go
View File

@ -34,8 +34,8 @@ func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleRespon
}
}
// 获取全部正常菜单列表
adminMenu, _ := AdminMenuDao.GetAdminMenuListNormalSortOrderNum()
// 获取全部正常非按钮菜单列表
adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
if adminMenu == nil {
return []*roleResponse.GetRoleMenuList{}, nil
}