From c4338024c90cd36a330d42194bb553525828fa3b Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期五, 14 二月 2025 16:28:10 +0800 Subject: [PATCH] 问题优化 --- app/service/knowledge.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/service/knowledge.py b/app/service/knowledge.py index ffd6dcf..e175f87 100644 --- a/app/service/knowledge.py +++ b/app/service/knowledge.py @@ -15,9 +15,11 @@ query = db.query(KnowledgeModel).filter(KnowledgeModel.knowledge_type==knowledge) if user.permission != "admin": klg_list = [j.id for i in user.groups for j in i.knowledges] - query = query.filter(or_(KnowledgeModel.tenant_id == user_id, KnowledgeModel.id.in_(klg_list))) + query = query.filter(or_(KnowledgeModel.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id))) + if location: - query = query.filter(KnowledgeModel.permission == "team") + query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id))) + if keyword: query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword))) total = query.count() @@ -28,7 +30,7 @@ async def create_knowledge_service(db, klg_id, name, description, icon, klg_type, user_id): try: - dialog_model = KnowledgeModel(id=klg_id,name=name, description=description,icon=icon, knowledge_type=klg_type, tenant_id=user_id) + dialog_model = KnowledgeModel(id=klg_id,name=name, description=description,icon=icon, knowledge_type=klg_type, tenant_id=user_id,update_date=datetime.now(),create_date=datetime.now()) db.add(dialog_model) db.commit() db.refresh(dialog_model) @@ -50,6 +52,7 @@ knowledge.permission = app_knowledge["permission"] knowledge.documents = app_knowledge["doc_num"] knowledge.status = app_knowledge["status"] + knowledge.update_date = datetime.now() db.add(knowledge) db.commit() db.refresh(knowledge) -- Gitblit v1.8.0