From 8bdf23fbac7fc8cfbc943927683e764deac3f3f7 Mon Sep 17 00:00:00 2001
From: xiaofeng wang <dewujie64@gmail.com>
Date: Thu, 17 Jul 2025 11:05:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0SQL=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=85=B6=E4=BB=96=E5=90=8E=E7=BB=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BB=A5=E6=94=B9=E8=BF=9B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DB.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/DB.py b/DB.py
index eaaf227..2790b1e 100644
--- a/DB.py
+++ b/DB.py
@@ -339,7 +339,6 @@ class DBVidcon:
             items = []
         return items
 
-
     @redis_retry(max_retries=3)
     def item_keyword(self, count: int = 20):
         try:
@@ -407,26 +406,14 @@ class DBVidcon:
     @mysql_retry()
     def get_subsequent_report_video(self, did: int):
         sql = """
-<<<<<<< HEAD
               SELECT DISTINCT report_id
               FROM sh_dm_fight_records
               WHERE status = 2
-                AND subsequent_status = 1
+                AND subsequent_status in (1, 3)
                 AND report_time != ''
-        AND mid = %s \
+        AND mid = %s 
               """
         self.cursor.execute(sql, did)
-=======
-    SELECT DISTINCT report_id
-    FROM sh_dm_fight_records
-    WHERE
-        status = 2
-        AND subsequent_status in (1, 3)
-        AND report_time != ''
-        AND mid = %s
-        """
-        self.cursor.execute(sql,did)
->>>>>>> origin/main
         return self.cursor.fetchall()
 
     @mysql_retry()