Merge branch 'dev/v1.0.3_rjj' of SocialPlatform/knowledgeBase into feature/v1.0.3

rpc/knowledge/internal/service/commonPhrasesService.go

@@ -154,7 +154,7 @@ func (c *CommonPhrasesService) CommonPhrasesClassList(param *knowledgeclient.Com
 	//先查询数据在分类、排序
 	data := &[]map[string]interface{}{}
 	if param.Query != "" {
-		data = Mysql.SelectBySql("SELECT classify,content FROM `socialize_common_phrases` WHERE entId = ? AND appId = ? AND status = 0  AND content like '%"+param.Query+"%' ORDER BY CONVERT(classify USING GBK) ASC", param.EntId, param.AppId)
+		data = Mysql.SelectBySql("SELECT classify,content FROM `socialize_common_phrases` WHERE entId = ? AND appId = ? AND status = 0  AND (content like '%"+param.Query+"%' OR classify like '%"+param.Query+"%') ORDER BY CONVERT(classify USING GBK) ASC", param.EntId, param.AppId)
 	} else {
 		data = Mysql.SelectBySql("SELECT classify,content FROM `socialize_common_phrases` WHERE entId = ? AND appId = ? AND status = 0 ORDER BY CONVERT(classify USING GBK) ASC", param.EntId, param.AppId)
 	}