From e75873911685dcffe4b4815a9326b86cb7d0ff35 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 28 Jul 2025 11:24:42 +0800
Subject: [PATCH] :art: Database grouping by field
 https://github.com/siyuan-note/siyuan/issues/10964

---
 kernel/sql/av.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kernel/sql/av.go b/kernel/sql/av.go
index 747fb5d76..cd534fd2b 100644
--- a/kernel/sql/av.go
+++ b/kernel/sql/av.go
@@ -633,8 +633,14 @@ func filterByQuery(query string, collection av.Collection) {
 
 // manualSort 处理用户手动排序。
 func manualSort(view *av.View, collection av.Collection) {
+	itemIDs := view.ItemIDs
+	// 如果是分组视图，则需要根据分组项的顺序进行排序
+	if 0 < len(view.GroupItemIDs) {
+		itemIDs = view.GroupItemIDs
+	}
+
 	sortItemIDs := map[string]int{}
-	for i, itemID := range view.ItemIDs {
+	for i, itemID := range itemIDs {
 		sortItemIDs[itemID] = i
 	}