From d8c080ee522de364eb69810e7fdc90adf114557a Mon Sep 17 00:00:00 2001 From: KevinHuSh Date: Wed, 15 May 2024 12:51:57 +0800 Subject: [PATCH] fix bugs in searching file using keywords (#780) ### What problem does this PR solve? ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- api/db/services/file_service.py | 4 ++-- api/db/services/task_service.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/db/services/file_service.py b/api/db/services/file_service.py index 664a11773..e551509cc 100644 --- a/api/db/services/file_service.py +++ b/api/db/services/file_service.py @@ -34,9 +34,9 @@ class FileService(CommonService): orderby, desc, keywords): if keywords: files = cls.model.select().where( - (cls.model.tenant_id == tenant_id) + (cls.model.tenant_id == tenant_id), (cls.model.parent_id == pf_id), - (fn.LOWER(cls.model.name).like(f"%%{keywords.lower()}%%")), + (fn.LOWER(cls.model.name).contains(keywords.lower())), ~(cls.model.id == pf_id) ) else: diff --git a/api/db/services/task_service.py b/api/db/services/task_service.py index 8d96fefbc..6dcad8265 100644 --- a/api/db/services/task_service.py +++ b/api/db/services/task_service.py @@ -96,7 +96,7 @@ class TaskService(CommonService): return doc.run == TaskStatus.CANCEL.value or doc.progress < 0 except Exception as e: pass - return True + return False @classmethod @DB.connection_context()