Skip to content

Commit 4914111

Browse files
committed
Merge branch 'fix/1.1.3/qa' into test
2 parents 8256a67 + 50beae6 commit 4914111

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

internal/repo/answer/answer_repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func (ar *answerRepo) SearchList(ctx context.Context, search *entity.AnswerSearc
258258
search.PageSize = constant.DefaultPageSize
259259
}
260260
offset := search.Page * search.PageSize
261-
session := ar.data.DB.Context(ctx).Where("")
261+
session := ar.data.DB.Context(ctx)
262262

263263
if search.QuestionID != "" {
264264
session = session.And("question_id = ?", search.QuestionID)

internal/repo/user/user_backyard_repo.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,21 @@ func (ur *userAdminRepo) GetUserPage(ctx context.Context, page, pageSize int, us
131131
session := ur.data.DB.Context(ctx)
132132
switch user.Status {
133133
case entity.UserStatusDeleted:
134-
session.Desc("user.deleted_at")
134+
session.Desc("`user`.deleted_at")
135135
case entity.UserStatusSuspended:
136-
session.Desc("user.suspended_at")
136+
session.Desc("`user`.suspended_at")
137137
default:
138-
session.Desc("user.created_at")
138+
session.Desc("`user`.created_at")
139139
}
140140

141141
if len(usernameOrDisplayName) > 0 {
142142
session.And(builder.Or(
143-
builder.Like{"user.username", usernameOrDisplayName},
144-
builder.Like{"user.display_name", usernameOrDisplayName},
143+
builder.Like{"`user`.username", usernameOrDisplayName},
144+
builder.Like{"`user`.display_name", usernameOrDisplayName},
145145
))
146146
}
147147
if isStaff {
148-
session.Join("INNER", "user_role_rel", "user.id = user_role_rel.user_id AND user_role_rel.role_id > 1")
148+
session.Join("INNER", "user_role_rel", "`user`.id = `user_role_rel`.user_id AND `user_role_rel`.role_id > 1")
149149
}
150150

151151
total, err = pager.Help(page, pageSize, &users, user, session)

0 commit comments

Comments
 (0)