From c1fd1cebef84468cbd297378741a6f973d0152ea Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 12 Jul 2025 15:41:46 +0800
Subject: [PATCH] :art: Database grouping by field
 https://github.com/siyuan-note/siyuan/issues/10964

---
 kernel/model/attribute_view.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index eddce99a1..41c47c9aa 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -1572,12 +1572,14 @@ func genAttrViewViewGroups(view *av.View, attrView *av.AttributeView) {
 					groupName = groupNameToday
 				} else if contentTime.Equal(now.AddDate(0, 0, 1)) {
 					groupName = groupNameTomorrow
-				} else if contentTime.Before(now.AddDate(0, 0, 7)) {
-					groupName = groupNameNext7Days
-				} else if contentTime.Before(now.AddDate(0, 0, 30)) {
-					groupName = groupNameNext30Days
-				} else {
+				} else if contentTime.After(now.AddDate(0, 0, 30)) {
 					groupName = contentTime.Format("2006-01")
+				} else if contentTime.After(now.AddDate(0, 0, 7)) {
+					groupName = groupNameNext30Days
+				} else if contentTime.After(now.AddDate(0, 0, 1)) {
+					groupName = groupNameNext7Days
+				} else {
+					groupName = notInRange
 				}
 			}
 		}