Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

model/gmodel/fs_resource_logic.go

@@ -2,7 +2,6 @@ package gmodel
 
 import (
 	"context"
-	"errors"
 	"fusenapi/utils/handlers"
 
 	"gorm.io/gorm"
@@ -10,16 +9,9 @@ import (
 
 // TODO: 使用model的属性做你想做的
 
-func (p *FsResourceModel) FindOneById(ctx context.Context, resourceId string) (*FsResource, error) {
-	var resp FsResource
-	result := p.db.Table(p.name).WithContext(ctx).Where("resource_id =?", resourceId).Take(&resp)
-	if result.Error != nil {
-		// 检查 ErrRecordNotFound 错误
-		if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-			return nil, result.Error
-		}
-	}
-	return &resp, nil
+func (p *FsResourceModel) FindOneById(ctx context.Context, resourceId string) (resp *FsResource, err error) {
+	err = p.db.Table(p.name).WithContext(ctx).Where("resource_id =?", resourceId).Take(&resp).Error
+	return resp, err
 }
 
 func (p *FsResourceModel) Create(ctx context.Context, req *FsResource) (resp *FsResource, err error) {