From 905bfdfa863093c6dc5764170349e7f98be4e24e Mon Sep 17 00:00:00 2001
From: zhoushuaikang <863909694@qq.com>
Date: Sun, 7 Jan 2024 00:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DcontactLabel=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/DataBase/micro_msg.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/DataBase/micro_msg.py b/app/DataBase/micro_msg.py
index ac6a7e1..17e19cc 100644
--- a/app/DataBase/micro_msg.py
+++ b/app/DataBase/micro_msg.py
@@ -57,6 +57,22 @@ class MicroMsg:
                   '''
             self.cursor.execute(sql)
             result = self.cursor.fetchall()
+        except sqlite3.OperationalError:
+            # lock.acquire(True)
+            sql = '''
+                   SELECT UserName, Alias, Type, Remark, NickName, PYInitial, RemarkPYInitial, ContactHeadImgUrl.smallHeadImgUrl, ContactHeadImgUrl.bigHeadImgUrl,ExTraBuf,"None"
+                   FROM Contact
+                   INNER JOIN ContactHeadImgUrl ON Contact.UserName = ContactHeadImgUrl.usrName
+                   WHERE (Type!=4 AND VerifyFlag=0)
+                        AND NickName != ''
+                    ORDER BY 
+                        CASE
+                            WHEN RemarkPYInitial = '' THEN PYInitial
+                            ELSE RemarkPYInitial
+                        END ASC
+            '''
+            self.cursor.execute(sql)
+            result = self.cursor.fetchall()
         finally:
             lock.release()
         from app.DataBase import msg_db
@@ -76,6 +92,16 @@ class MicroMsg:
                 '''
             self.cursor.execute(sql, [username])
             result = self.cursor.fetchone()
+        except sqlite3.OperationalError:
+            # lock.acquire(True)
+            sql = '''
+                   SELECT UserName, Alias, Type, Remark, NickName, PYInitial, RemarkPYInitial, ContactHeadImgUrl.smallHeadImgUrl, ContactHeadImgUrl.bigHeadImgUrl,ExTraBuf,"None"
+                   FROM Contact
+                   INNER JOIN ContactHeadImgUrl ON Contact.UserName = ContactHeadImgUrl.usrName
+                   WHERE UserName = ?
+            '''
+            self.cursor.execute(sql, [username])
+            result = self.cursor.fetchone()
         finally:
             lock.release()