diff --git a/.gitignore b/.gitignore
index 424d9f6..b027ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ data
 sqlcipher-3.0.1
 dist
 venv
+venv_decrypt
+venv_main_pc
 TEST
 app/data/avatar
 app/data/image2
diff --git a/app/DataBase/merge.py b/app/DataBase/merge.py
index 75a42df..e28073e 100644
--- a/app/DataBase/merge.py
+++ b/app/DataBase/merge.py
@@ -15,14 +15,17 @@ def merge_databases(source_paths, target_path):
             db = sqlite3.connect(source_path)
             cursor = db.cursor()
             sql = '''
-            SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent 
+            SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,BytesExtra
             FROM MSG;
             '''
             cursor.execute(sql)
             result = cursor.fetchall()
             # 附加源数据库
             target_cursor.executemany(
-                "INSERT INTO MSG (TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent) VALUES(?,?,?,?,?,?,?,?,?,?)",
+                "INSERT INTO MSG "
+                "(TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,"
+                "BytesExtra)"
+                "VALUES(?,?,?,?,?,?,?,?,?,?,?)",
                 result)
             cursor.close()
             db.close()
diff --git a/app/ui_pc/mainview.py b/app/ui_pc/mainview.py
index 43c456d..c8e2450 100644
--- a/app/ui_pc/mainview.py
+++ b/app/ui_pc/mainview.py
@@ -77,6 +77,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
         self.listWidget.clear()
         self.resize(QSize(800, 600))
         self.action_desc.triggered.connect(self.about)
+        self.load_flag = False
         self.load_data()
         self.load_num = 0
         self.label = QLabel(self)
@@ -96,6 +97,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
                     me.wx_dir = dic.get('wx_dir')
                     print('wx_dir', me.wx_dir)
                     self.set_my_info(wxid)
+                    self.load_flag = True
         else:
             QMessageBox.information(
                 self,
@@ -120,14 +122,11 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
         chat_item = QListWidgetItem(Icon.Chat_Icon, '聊天', self.listWidget)
         contact_item = QListWidgetItem(Icon.Contact_Icon, '好友', self.listWidget)
         myinfo_item = QListWidgetItem(Icon.MyInfo_Icon, '我的', self.listWidget)
-
         tool_window = ToolWindow()
         tool_window.get_info_signal.connect(self.set_my_info)
         tool_window.decrypt_success_signal.connect(self.load_data)
         tool_window.load_finish_signal.connect(self.loading)
         self.stackedWidget.addWidget(tool_window)
-        self.listWidget.setCurrentRow(0)
-        self.stackedWidget.setCurrentIndex(0)
         self.chat_window = ChatWindow()
         # chat_window = QWidget()
         self.stackedWidget.addWidget(self.chat_window)
@@ -185,6 +184,12 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
             self.okSignal.emit(True)
             self.listWidget.setVisible(True)
             self.stackedWidget.setVisible(True)
+            if self.load_flag:
+                self.listWidget.setCurrentRow(1)
+                self.stackedWidget.setCurrentIndex(1)
+            else:
+                self.listWidget.setCurrentRow(0)
+                self.stackedWidget.setCurrentIndex(0)
 
     def output(self):
         if self.sender() == self.action_output_CSV:
diff --git a/main_pc.py b/main_pc.py
index d6e1531..cd25342 100644
--- a/main_pc.py
+++ b/main_pc.py
@@ -38,10 +38,6 @@ class ViewController(QWidget):
         start = time.time()
         self.viewMainWIndow = mainview.MainWinController(username=username)
         self.viewMainWIndow.setWindowTitle("Chat")
-        # print(username)
-        self.viewMainWIndow.username = username
-        # self.viewMainWIn.exitSignal.connect(self.loadDecryptView)  # 不需要回到登录界面可以省略
-
         self.viewMainWIndow.show()
         end = time.time()
         print('ok', end - start)