Selaa lähdekoodia

知识库选择返回自己创建的

zhaoqingang 1 vuosi sitten
vanhempi
sitoutus
5a11a870e2
1 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 3 1
      app/service/knowledge.py

+ 3 - 1
app/service/knowledge.py

@@ -15,9 +15,11 @@ async def get_knowledge_list(db, user_id, keyword, page_size, page_index, status
     query = db.query(KnowledgeModel).filter(KnowledgeModel.knowledge_type==knowledge)
     query = db.query(KnowledgeModel).filter(KnowledgeModel.knowledge_type==knowledge)
     if user.permission != "admin":
     if user.permission != "admin":
         klg_list = [j.id for i in user.groups for j in i.knowledges]
         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:
     if location:
         query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id)))
         query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id)))
+
     if keyword:
     if keyword:
         query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword)))
         query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword)))
     total = query.count()
     total = query.count()