From 7771177f9c8eb4fc933a964e807d992bd6680cb6 Mon Sep 17 00:00:00 2001
From: JSR <pandajsr72@gmail.com>
Date: Fri, 20 Mar 2026 17:27:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=A7=E5=BF=AB=E7=85=A7=E5=9B=9E=E5=86=99?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=A7=AF=E5=88=86=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/commands/database.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src-tauri/src/commands/database.rs b/src-tauri/src/commands/database.rs
index 3e35dc8..545209c 100644
--- a/src-tauri/src/commands/database.rs
+++ b/src-tauri/src/commands/database.rs
@@ -636,13 +636,9 @@ async fn db_sync_apply_internal(
     };
 
     let local_students = load_students(&local_conn).await?;
-    let remote_students = load_students(&remote_conn).await?;
     let local_reasons = load_reasons(&local_conn).await?;
-    let remote_reasons = load_reasons(&remote_conn).await?;
     let local_tags = load_tags(&local_conn).await?;
-    let remote_tags = load_tags(&remote_conn).await?;
     let local_events = load_events(&local_conn).await?;
-    let remote_events = load_events(&remote_conn).await?;
     let local_pairs = load_student_tag_pairs(&local_conn).await?;
     let remote_pairs = load_student_tag_pairs(&remote_conn).await?;
 
@@ -660,7 +656,8 @@ async fn db_sync_apply_internal(
             synced_records += 1;
         }
     }
-    for student in remote_students.values() {
+    let remote_students_after = load_students(&remote_conn).await?;
+    for student in remote_students_after.values() {
         if upsert_student(&local_conn, student).await? {
             synced_records += 1;
         }
@@ -670,7 +667,8 @@ async fn db_sync_apply_internal(
             synced_records += 1;
         }
     }
-    for reason in remote_reasons.values() {
+    let remote_reasons_after = load_reasons(&remote_conn).await?;
+    for reason in remote_reasons_after.values() {
         if upsert_reason(&local_conn, reason).await? {
             synced_records += 1;
         }
@@ -680,7 +678,8 @@ async fn db_sync_apply_internal(
             synced_records += 1;
         }
     }
-    for tag in remote_tags.values() {
+    let remote_tags_after = load_tags(&remote_conn).await?;
+    for tag in remote_tags_after.values() {
         if upsert_tag(&local_conn, tag).await? {
             synced_records += 1;
         }
@@ -690,7 +689,8 @@ async fn db_sync_apply_internal(
             synced_records += 1;
         }
     }
-    for event in remote_events.values() {
+    let remote_events_after = load_events(&remote_conn).await?;
+    for event in remote_events_after.values() {
         if upsert_event(&local_conn, event).await? {
             synced_records += 1;
         }