Merge remote-tracking branch 'origin/dev' into dev

kernel/model/attribute_view.go

@@ -2835,7 +2835,7 @@ func replaceAttributeViewBlock(operation *Operation, tx *Transaction) (err error
 	// 检查是否已经存在绑定块，如果存在的话则重新绑定
 	for _, keyValues := range attrView.KeyValues {
 		for _, value := range keyValues.Values {
-			if value.BlockID == operation.NextID {
+			if av.KeyTypeBlock == value.Type && nil != value.Block && value.BlockID == operation.NextID {
 				if !operation.IsDetached {
 					bindBlockAv0(tx, operation.AvID, node, tree)
 					value.IsDetached = false