🐛 Incorrect results for database rollup field filtering https://github.com/siyuan-note/siyuan/issues/15608

kernel/sql/av.go

@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/88250/gulu"
-	"github.com/88250/lute/ast"
 	"github.com/jinzhu/copier"
 	"github.com/siyuan-note/logging"
 	"github.com/siyuan-note/siyuan/kernel/av"
@@ -385,7 +384,6 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection
 
 				var furtherCollection av.Collection
 				if av.KeyTypeTemplate == destKey.Type {
-
 					// 渲染目标视图，这样才能汇总渲染后的模板字段值
 					viewable := renderView(destAv, destAv.Views[0], "", depth, renderedAttrViews)
 					if nil != viewable {
@@ -396,29 +394,7 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection
 					}
 				}
 
-				value.Rollup.Contents = nil
-				for _, blockID := range relVal.Relation.BlockIDs {
-					destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID)
-					if nil != furtherCollection && av.KeyTypeTemplate == destKey.Type {
-						destVal = furtherCollection.GetValue(blockID, destKey.ID)
-					}
-
-					if nil == destVal {
-						if destAv.ExistItem(blockID) { // 数据库中存在项目但是字段值不存在是数据未初始化，这里补一个默认值
-							destVal = av.GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
-						}
-						if nil == destVal {
-							continue
-						}
-					}
-					if av.KeyTypeNumber == destKey.Type {
-						destVal.Number.Format = destKey.NumberFormat
-						destVal.Number.FormatNumber()
-					}
-
-					value.Rollup.Contents = append(value.Rollup.Contents, destVal.Clone())
-				}
-
+				value.Rollup.Contents = av.GetRollupContents(destAv, destKey, relVal.Relation.BlockIDs, furtherCollection)
 				value.Rollup.RenderContents(rollupKey.Rollup.Calc, destKey)
 			case av.KeyTypeRelation: // 渲染关联
 				value.Relation.Contents = nil