#887 #875

electron/services/annualReportService.ts

@@ -1,5 +1,6 @@
 import { parentPort } from 'worker_threads'
 import { wcdbService } from './wcdbService'
+import { ConfigService } from './config'
 
 export interface TopContact {
   username: string
@@ -158,9 +159,14 @@ class AnnualReportService {
     if (!dbPath) return { success: false, error: '未配置数据库路径' }
     if (!decryptKey) return { success: false, error: '未配置解密密钥' }
 
-    const cleanedWxid = this.cleanAccountDirName(wxid)
-    const ok = await wcdbService.open(dbPath, decryptKey, cleanedWxid)
+    const configService = ConfigService.getInstance()
+    const accountDir = configService.getAccountDir(dbPath, wxid)
+    if (!accountDir) return { success: false, error: '未找到账号目录' }
+
+    const ok = await wcdbService.open(accountDir, decryptKey)
     if (!ok) return { success: false, error: 'WCDB 打开失败' }
+
+    const cleanedWxid = this.cleanAccountDirName(wxid)
     return { success: true, cleanedWxid, rawWxid: wxid }
   }