renjiaojiao пре 3 година
родитељ
комит
d446258aee

+ 2 - 2
rpc/knowledge/internal/logic/knowledgeaddlogic.go

@@ -39,8 +39,8 @@ func (l *KnowledgeAddLogic) KnowledgeAdd(in *knowledgeclient.AddRequest) (*knowl
 	// todo: add your logic here and delete this line
 	result := &knowledgeclient.AddResponse{}
 	//先查找知识库Id
-	query := map[string]interface{}{"status": 1, "appid": in.AppId, "tenant_id": in.EntId}
-	log.Println(query)
+	query := map[string]interface{}{"status": 1, "appid": in.AppId, "ent_id": in.EntId}
+	log.Println("查询知识库条件:", query)
 	datalist := Mysql.Find(util.KNOWLEDGE, query, "id", "", -1, -1)
 	if datalist != nil && *datalist != nil && len(*datalist) > 0 {
 		//问题进行分词

+ 2 - 2
rpc/knowledge/internal/logic/knowledgelistlogic.go

@@ -33,14 +33,14 @@ func (l *KnowledgeListLogic) KnowledgeList(in *knowledgeclient.ListRequest) (*kn
 	var data []*knowledgeclient.KnowledgeEntity
 	countSql := "SELECT COUNT(b.id)  FROM " + util.KNOWLEDGE +
 		" a LEFT JOIN " + util.ANSWER + " b ON a.id = b.knowledge_id LEFT JOIN " + util.QUESTION +
-		" c ON b.id = c.answer_id WHERE b.`status` =1 and a.tenant_id=?"
+		" c ON b.id = c.answer_id WHERE b.`status` =1 and a.ent_id=?"
 	count := Mysql.CountBySql(countSql, in.EntId)
 	log.Println("总数:", count)
 	if count > 0 {
 		//列表数据
 		sql := "SELECT b.content as answer,c.content as question,b.id,b.knowledge_id  FROM " + util.KNOWLEDGE +
 			" a LEFT JOIN " + util.ANSWER + " b ON a.id = b.knowledge_id LEFT JOIN " + util.QUESTION +
-			" c ON b.id = c.answer_id WHERE b.`status` =1 and a.tenant_id=? limit ?,?"
+			" c ON b.id = c.answer_id WHERE b.`status` =1 and a.ent_id=? limit ?,?"
 		datalist := Mysql.SelectBySql(sql, in.EntId, (in.PageIndex-1)*in.PageSize, in.PageSize)
 		if datalist != nil && *datalist != nil && len(*datalist) > 0 {
 			for _, value := range *datalist {