Skip to content

Commit 7dd3715

Browse files
committed
Merge branch 'feat/1.0.6/object-not-found' into test
2 parents e8023cc + ba8e173 commit 7dd3715

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

internal/repo/answer/answer_repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearc
207207
session = session.OrderBy("adopted desc,vote_count desc,created_at asc")
208208
}
209209
if !search.IncludeDeleted {
210-
session = session.And("status = ? OR user_id = ?", entity.AnswerStatusAvailable, search.UserID)
210+
session = session.And("status = ? OR user_id = ?", entity.AnswerStatusAvailable, search.LoginUserID)
211211
}
212212

213213
session = session.Limit(search.PageSize, offset)

internal/service/answer_service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ func (as *AnswerService) SearchList(ctx context.Context, req *schema.AnswerListR
479479
dbSearch.PageSize = req.PageSize
480480
dbSearch.Order = req.Order
481481
dbSearch.IncludeDeleted = req.CanDelete
482+
dbSearch.LoginUserID = req.UserID
482483
answerOriginalList, count, err := as.answerRepo.SearchList(ctx, &dbSearch)
483484
if err != nil {
484485
return list, count, err

0 commit comments

Comments
 (0)