修改1

api/dao/adminMenu.go

@@ -8,6 +8,7 @@ import (
 type AdminMenuDao struct {
 }
 
+// GetAdminMenuList 获取菜单列表
 func (r *AdminMenuDao) GetAdminMenuList() (m []*model.AdminMenu, err error) {
 	err = global.Db.Find(&m).Error
 	if err != nil {
@@ -16,6 +17,7 @@ func (r *AdminMenuDao) GetAdminMenuList() (m []*model.AdminMenu, err error) {
 	return m, nil
 }
 
+// GetAdminMenuListSortOrderNum 获取菜单列表-排序
 func (r *AdminMenuDao) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err error) {
 	err = global.Db.Order("order_num asc").Find(&m).Error
 	if err != nil {
@@ -23,3 +25,12 @@ func (r *AdminMenuDao) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err
 	}
 	return m, nil
 }
+
+// GetAdminMenuById 获取菜单数据-菜单id
+func (r *AdminMenuDao) GetAdminMenuById(menuId int64) (m *model.AdminMenu, err error) {
+	err = global.Db.First(&m, menuId).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}

api/dao/adminRole.go

@@ -1,6 +1,7 @@
 package dao
 
 import (
+	"gorm.io/gorm"
 	"hospital-admin-api/api/model"
 	"hospital-admin-api/global"
 )
@@ -10,28 +11,28 @@ type AdminRoleDao struct {
 
 // GetAdminRoleFirstById 角色id获取用户角色
 // roleId 角色id
-func (r *AdminRoleDao) GetAdminRoleFirstById(roleId int64) (m model.AdminRole, err error) {
+func (r *AdminRoleDao) GetAdminRoleFirstById(roleId int64) (m *model.AdminRole, err error) {
 	err = global.Db.First(&m, roleId).Error
 	if err != nil {
-		return m, err
+		return nil, err
 	}
 	return m, nil
 }
 
 // GetAdminRolePageSearch 搜索角色列表-分页
-func (r *AdminRoleDao) GetAdminRolePageSearch(roleName string, page, pageSize int) (m []model.AdminRole, err error) {
+func (r *AdminRoleDao) GetAdminRolePageSearch(roleName string, page, pageSize int) (m []*model.AdminRole, err error) {
 	// 计算偏移量
 	offset := (page - 1) * pageSize
 
 	if roleName != "" {
 		err = global.Db.Where("role_name = ?", roleName).Offset(offset).Limit(pageSize).Find(&m).Error
 		if err != nil {
-			return m, err
+			return nil, err
 		}
 	} else {
 		err = global.Db.Offset(offset).Limit(pageSize).Find(&m).Error
 		if err != nil {
-			return m, err
+			return nil, err
 		}
 	}
 	return m, nil
@@ -45,3 +46,11 @@ func (r *AdminRoleDao) EditAdminRoleStatusById(roleId int64, roleStatus int) err
 	}
 	return nil
 }
+
+// AddAdminRole 新增角色
+func (r *AdminRoleDao) AddAdminRole(tx *gorm.DB, model *model.AdminRole) (*model.AdminRole, error) {
+	if err := tx.Create(model).Error; err != nil {
+		return nil, err
+	}
+	return model, nil
+}

api/dao/adminUser.go

@@ -10,19 +10,19 @@ type AdminUserDao struct {
 
 // GetAdminUserFirstById 获取用户数据-用户id
 // roleId 用户id
-func (r *AdminUserDao) GetAdminUserFirstById(userId int64) (m model.AdminUser, err error) {
+func (r *AdminUserDao) GetAdminUserFirstById(userId int64) (m *model.AdminUser, err error) {
 	err = global.Db.First(&m, userId).Error
 	if err != nil {
-		return m, err
+		return nil, err
 	}
 	return m, nil
 }
 
 // GetAdminUserFirstByAccess 获取用户数据-用户账号
-func (r *AdminUserDao) GetAdminUserFirstByAccess(username string) (m model.AdminUser, err error) {
+func (r *AdminUserDao) GetAdminUserFirstByAccess(username string) (m *model.AdminUser, err error) {
 	err = global.Db.Where("access = ?", username).First(&m).Error
 	if err != nil {
-		return m, err
+		return nil, err
 	}
 	return m, nil
 }