Skip to content

Commit 0a86dce

Browse files
authored
Merge pull request #293 from Jinvic/feat/memo
gorm实例复用导致sql污染
2 parents b406744 + 395208f commit 0a86dce

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

backend/handler/memo.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (m MemoHandler) ListMemos(c echo.Context) error {
171171
_ = json.Unmarshal([]byte(sysConfig.Content), &sysConfigVO)
172172
offset := (req.Page - 1) * req.Size
173173

174-
tx := m.base.db.Preload("User", func(x *gorm.DB) *gorm.DB {
174+
tx := m.base.db.Model(&db.Memo{}).Preload("User", func(x *gorm.DB) *gorm.DB {
175175
return x.Select("username", "nickname", "slogan", "id", "avatarUrl", "coverUrl")
176176
})
177177

@@ -212,8 +212,8 @@ func (m MemoHandler) ListMemos(c echo.Context) error {
212212
if req.UserId != nil {
213213
tx = tx.Where("userId = ?", req.UserId)
214214
}
215-
tx.Order("pinned desc, createdAt desc").Limit(req.Size).Offset(offset).Find(&list)
216-
tx.Count(&total)
215+
tx.Session(&gorm.Session{}).Order("pinned desc, createdAt desc").Limit(req.Size).Offset(offset).Find(&list)
216+
tx.Session(&gorm.Session{}).Count(&total)
217217

218218
for i, memo := range list {
219219
var comments []db.Comment

0 commit comments

Comments
 (0)