diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go index 017cdb93e..fb39805e5 100644 --- a/kernel/model/backlink.go +++ b/kernel/model/backlink.go @@ -317,7 +317,7 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode linkRefs, linkRefsCount, excludeBacklinkIDs := buildLinkRefs(rootID, refs) tmpBacklinks := toFlatTree(linkRefs, 0, "backlink") - var boxIDs []string + for _, l := range tmpBacklinks { l.Blocks = nil if "" != keyword { @@ -326,14 +326,6 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode } } backlinks = append(backlinks, l) - boxIDs = append(boxIDs, l.Box) - } - boxIDs = gulu.Str.RemoveDuplicatedElem(boxIDs) - - boxNames := Conf.BoxNames(boxIDs) - for _, l := range backlinks { - name := boxNames[l.Box] - l.HPath = name + "/" + l.HPath } sort.Slice(backlinks, func(i, j int) bool { @@ -370,11 +362,6 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode backmentions = append(backmentions, l) } - for _, l := range backmentions { - name := boxNames[l.Box] - l.HPath = name + "/" + l.HPath - } - sort.Slice(backmentions, func(i, j int) bool { switch mentionSortMode { case util.SortModeUpdatedDESC: @@ -398,6 +385,25 @@ func GetBacklink2(id, keyword, mentionKeyword string, sortMode, mentionSortMode }) mentionsCount = len(backmentions) + + // 添加笔记本名称 + var boxIDs []string + for _, l := range backlinks { + boxIDs = append(boxIDs, l.Box) + } + for _, l := range backmentions { + boxIDs = append(boxIDs, l.Box) + } + boxIDs = gulu.Str.RemoveDuplicatedElem(boxIDs) + boxNames := Conf.BoxNames(boxIDs) + for _, l := range backlinks { + name := boxNames[l.Box] + l.HPath = name + l.HPath + } + for _, l := range backmentions { + name := boxNames[l.Box] + l.HPath = name + l.HPath + } return }