Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

修复匹配时候忽视了word_type的约束

Browse Source
This commit is contained in:
LambdaYH 2022-08-21 23:47:21 +08:00
parent 016a7e87ea
commit 31d4d29f3e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/word_bank/_model.py
View File

@ -234,10 +234,10 @@ class WordBank(db.Model):
query = query.where(cls.word_scope == word_type) query = query.where(cls.word_scope == word_type)
sql_text += f" and word_scope = {word_scope}" sql_text += f" and word_scope = {word_scope}"
# 完全匹配 # 完全匹配
if await query.where(cls.problem == problem).gino.first(): if await query.where(((cls.word_type == 0) | (cls.word_type == 3)) & (cls.problem == problem)).gino.first():
return query.where(cls.problem == problem) return query.where(cls.problem == problem)
# 模糊匹配 # 模糊匹配
if await query.where(cls.problem.contains(problem)).gino.first(): if await query.where((cls.word_type == 1) & (cls.problem.contains(problem))).gino.first():
return query.where(cls.problem.contains(problem)) return query.where(cls.problem.contains(problem))
# 正则匹配 # 正则匹配
if await db.first( if await db.first(