Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 07:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 数据历史每页最后一条记录时间异常 Fix https://github.com/siyuan-note/siyuan/issues/6455

Browse source
This commit is contained in:
Liang Ding 2022-11-02 20:01:07 +08:00
parent 9a1f0de288
commit be6380cbf7
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kernel/model/history.go
View file

@ -317,8 +317,7 @@ func FullTextSearchHistory(query, box, op string, typ, page int) (ret []*History
} }
pageSize := 32 pageSize := 32
from := (page - 1) * pageSize offset := (page - 1) * pageSize
to := page * pageSize
table := "histories_fts_case_insensitive" table := "histories_fts_case_insensitive"
stmt := "SELECT * FROM " + table + " WHERE " stmt := "SELECT * FROM " + table + " WHERE "
@ -341,7 +340,7 @@ func FullTextSearchHistory(query, box, op string, typ, page int) (ret []*History
stmt += " AND path LIKE '%/assets/%'" stmt += " AND path LIKE '%/assets/%'"
} }
countStmt := strings.ReplaceAll(stmt, "SELECT *", "SELECT COUNT(*) AS total") countStmt := strings.ReplaceAll(stmt, "SELECT *", "SELECT COUNT(*) AS total")
stmt += " ORDER BY created DESC LIMIT " + strconv.Itoa(from) + ", " + strconv.Itoa(to) stmt += " ORDER BY created DESC LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
sqlHistories := sql.SelectHistoriesRawStmt(stmt) sqlHistories := sql.SelectHistoriesRawStmt(stmt)
ret = fromSQLHistories(sqlHistories) ret = fromSQLHistories(sqlHistories)
result, err := sql.QueryHistory(countStmt) result, err := sql.QueryHistory(countStmt)
@ -660,12 +659,9 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*History) {
} }
var items []*HistoryItem var items []*HistoryItem
var tmpTime int64 tmpTime, _ := strconv.ParseInt(sqlHistories[0].Created, 10, 64)
for _, sqlHistory := range sqlHistories { for _, sqlHistory := range sqlHistories {
unixSec, _ := strconv.ParseInt(sqlHistory.Created, 10, 64) unixSec, _ := strconv.ParseInt(sqlHistory.Created, 10, 64)
if 0 == tmpTime {
tmpTime = unixSec
}
if tmpTime == unixSec { if tmpTime == unixSec {
item := &HistoryItem{ item := &HistoryItem{
Title: sqlHistory.Title, Title: sqlHistory.Title,
@ -691,6 +687,7 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*History) {
items = []*HistoryItem{} items = []*HistoryItem{}
items = append(items, item) items = append(items, item)
} }
tmpTime = unixSec
} }
if 0 < len(items) { if 0 < len(items) {
ret = append(ret, &History{ ret = append(ret, &History{