新增获取菜单列表

api/dao/adminMenu.go

@@ -1,2 +1,25 @@
 package dao
 
+import (
+	"hospital-admin-api/api/model"
+	"hospital-admin-api/global"
+)
+
+type AdminMenu struct {
+}
+
+func (r *AdminMenu) GetAdminMenuList() (m []*model.AdminMenu, err error) {
+	err = global.Db.Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (r *AdminMenu) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err error) {
+	err = global.Db.Order("order_num asc").Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}

api/dao/adminMenuApi.go

@@ -8,7 +8,7 @@ import (
 type AdminMenuApi struct {
 }
 
-// GetAdminMenuApiListByMenuID 菜单id获取菜单api
+// GetAdminMenuApiListByMenuID 获取菜单api-菜单id
 // menuId 菜单id
 func (r *AdminMenuApi) GetAdminMenuApiListByMenuID(menuId int64) (m []*model.AdminMenuApi, err error) {
 	err = global.Db.Where("menu_id = ?", menuId).Preload("API").Find(&m).Error

api/dao/adminRoleMenu.go

@@ -8,9 +8,18 @@ import (
 type AdminRoleMenu struct {
 }
 
-// GetAdminMenuListByRoleId GetAdminRoleById 角色id获取用户角色
+// GetAdminRoleMenuListByRoleId 获取角色菜单-角色id
 // roleId 角色id
-func (r *AdminRoleMenu) GetAdminMenuListByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
+func (r *AdminRoleMenu) GetAdminRoleMenuListByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
+	err = global.Db.Where("role_id = ?", roleId).Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+// GetAdminRoleMenuListWithMenuByRoleId 获取角色菜单
+func (r *AdminRoleMenu) GetAdminRoleMenuListWithMenuByRoleId(roleId int64) (m []*model.AdminRoleMenu, err error) {
 	err = global.Db.Where("role_id = ?", roleId).Preload("Menu").Find(&m).Error
 	if err != nil {
 		return nil, err