Merge branch 'dev' 修改知识库bug

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java

@@ -384,10 +384,12 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
         if (StringUtils.isEmpty(intent.getSkillCode())) {
             // 调用知识库问答
             AjaxResult qaAjax = searchQA(intent);
+            JSONObject qajson = qaAjax.toJson();
             String content = "";
-            if (qaAjax.toJson().containsKey("data") && StringUtils.isNotEmpty(qaAjax.toJson().getJSONObject("data").getString("result"))) {
+            log.info("知识库问答返回结果：{}",qaAjax.toString());
+            if (qajson.containsKey("data") && qajson.getJSONObject("data").containsKey("result") && qajson.getJSONObject("data").size() > 0) {
 
-                content = qaAjax.toJson().getJSONObject("data").getJSONArray("result").getJSONObject(0).getJSONObject("knowledge_lib").toString();
+                content = qajson.getJSONObject("data").getJSONArray("result").getJSONObject(0).getString("knowledge_lib");
             }
             pushIntoDashboardRedis(enterpriseName,content,"knowledge");
             return R.ok(JSONObject.from(qaAjax.get("data")));