From 93d32e89f526a836cfb7c838b907d8c28ae9178b Mon Sep 17 00:00:00 2001 From: Franklin-F Date: Thu, 12 Jun 2025 22:15:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DDB.py=E4=B8=AD?= =?UTF-8?q?=E7=9A=84SQL=E6=9F=A5=E8=AF=A2=E4=BB=A5=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=BB=91=E5=90=8D=E5=8D=95=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/DB.py b/DB.py index fd49a4b..8423ebe 100644 --- a/DB.py +++ b/DB.py @@ -435,15 +435,24 @@ WHERE a.white_status = 1; FROM sh_dm_keyword k LEFT JOIN - sh_dm_title t ON k.title = t.title + sh_dm_title t ON k.title = t.title WHERE k.status = 1 AND t.status = 1 AND NOT EXISTS ( - SELECT 1 FROM sh_dm_black_keyword b WHERE b.title = t.title + SELECT 1 + FROM sh_dm_black_keyword b + WHERE + ( + (b.keyword IS NULL OR b.keyword = '') AND b.title = t.title + ) + OR ( + b.keyword IS NOT NULL AND b.keyword != '' AND b.keyword = k.keyword + ) ) AND t.level = %s - GROUP BY k.keyword, k.rn + GROUP BY + k.keyword, k.rn; """ self.cursor.execute(sql, (level,)) return self.cursor.fetchall()