新增菜单，修改角色，分页

api/dao/adminRole.go

@@ -19,25 +19,6 @@ func (r *AdminRoleDao) GetAdminRoleFirstById(roleId int64) (m *model.AdminRole,
 	return m, nil
 }
 
-// GetAdminRolePageSearch 搜索角色列表-分页
-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 nil, err
-		}
-	} else {
-		err = global.Db.Offset(offset).Limit(pageSize).Find(&m).Error
-		if err != nil {
-			return nil, err
-		}
-	}
-	return m, nil
-}
-
 // EditAdminRoleStatusById 角色启用/禁用-角色id
 func (r *AdminRoleDao) EditAdminRoleStatusById(roleId int64, roleStatus int) error {
 	err := global.Db.Model(&model.AdminRole{}).Where("role_id = ?", roleId).Update("role_status", roleStatus).Error
@@ -54,3 +35,34 @@ func (r *AdminRoleDao) AddAdminRole(tx *gorm.DB, model *model.AdminRole) (*model
 	}
 	return model, nil
 }
+
+// GetAdminRolePageSearch 搜索角色列表-分页
+func (r *AdminRoleDao) GetAdminRolePageSearch(roleName string, page, pageSize int) (m []*model.AdminRole, total int64, err error) {
+	var totalRecords int64
+
+	// 构建查询条件
+	query := global.Db.Model(&model.AdminRole{})
+	if roleName != "" {
+		query = query.Where("role_name = ?", roleName)
+	}
+
+	// 查询总数量
+	if err := query.Count(&totalRecords).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err = query.Scopes(model.Paginate(page, pageSize)).Find(&m).Error
+	if err != nil {
+		return nil, 0, err
+	}
+	return m, totalRecords, nil
+}
+
+// EditAdminRoleById 修改角色
+func (r *AdminRoleDao) EditAdminRoleById(tx *gorm.DB, roleId int64, data interface{}) error {
+	err := tx.Model(&model.AdminRole{}).Where("role_id = ?", roleId).Updates(data).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}