update
This commit is contained in:
@@ -296,13 +296,24 @@ pub async fn execute_merge(db: &Database) -> MergeResult {
|
||||
// 其余的合并到目标
|
||||
for (src_id, src_name, _, _) in &items[1..] {
|
||||
println!("[合并] {} (id={}) → {} (id={})", src_name, src_id, dst_name, dst_id);
|
||||
|
||||
// 合并前统计 src 的别名数
|
||||
let src_aliases = db.get_person_aliases(*src_id).await;
|
||||
let alias_count_before = src_aliases.len();
|
||||
|
||||
db.merge_person_into(*src_id, dst_id).await;
|
||||
|
||||
// 合并后统计新增的别名数 (= src 别名数 + src 原名)
|
||||
result.persons_merged += 1;
|
||||
// src 原名 + src 的 display_name + src 原有的别名
|
||||
let moved = alias_count_before + 1; // +1 因为原名会成为 merged_original 别名
|
||||
result.aliases_moved += moved;
|
||||
}
|
||||
}
|
||||
|
||||
if result.persons_merged > 0 {
|
||||
println!("[合并] 完成:分析 {} 组,合并 {} 个人物", result.groups_analyzed, result.persons_merged);
|
||||
println!("[合并] 完成:分析 {} 组,合并 {} 个人物,迁移 {} 个别名",
|
||||
result.groups_analyzed, result.persons_merged, result.aliases_moved);
|
||||
}
|
||||
|
||||
result
|
||||
|
||||
Reference in New Issue
Block a user