From e9afbb6931e72d7803d22fa55a902ca62dee6511 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 11 Aug 2025 21:48:19 +0800
Subject: [PATCH 1/2] :art: Improve av
 https://github.com/siyuan-note/siyuan/issues/15531

---
 kernel/model/attribute_view.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 139bfc51d..281ab823a 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -3043,7 +3043,7 @@ func removeAttributeViewBlock(srcIDs []string, avID string, tx *Transaction) (er
 
 						if nil != tree {
 							trees[bt.RootID] = tree
-							if node := treenode.GetNodeInTree(tree, val.BlockID); nil != node {
+							if node := treenode.GetNodeInTree(tree, val.Block.ID); nil != node {
 								if err = removeNodeAvID(node, avID, tx, tree); err != nil {
 									return
 								}

From bbe200136684a9452393c3a46b1f6405abdb6924 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Mon, 11 Aug 2025 21:58:33 +0800
Subject: [PATCH 2/2] :art: Improve av
 https://github.com/siyuan-note/siyuan/issues/15540

---
 kernel/av/filter.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/av/filter.go b/kernel/av/filter.go
index 9f190787f..65ef4330f 100644
--- a/kernel/av/filter.go
+++ b/kernel/av/filter.go
@@ -853,6 +853,11 @@ func (filter *ViewFilter) GetAffectValue(key *Key, addingBlockID string) (ret *V
 		}
 	}
 
+	if FilterOperatorIsNotEmpty == filter.Operator {
+		// 在过滤非空值的情况下，不设置默认值 https://github.com/siyuan-note/siyuan/issues/15540
+		return nil
+	}
+
 	ret = filter.Value.Clone()
 	ret.ID = ast.NewNodeID()
 	ret.KeyID = key.ID