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()