Merge remote-tracking branch 'origin/master'

java/storlead-knowledge/storlead-knowledge-biz/src/main/java/com/storlead/knowledge/service/impl/AiMessageReviewServiceImpl.java

@@ -2,6 +2,7 @@ package com.storlead.knowledge.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
+import com.storlead.framework.util.LoginUserUtil;
 import com.storlead.knowledge.entity.AiMessageReviewEntity;
 import com.storlead.knowledge.mapper.AiMessageReviewMapper;
 import com.storlead.knowledge.service.AiMessageReviewService;
@@ -22,6 +23,7 @@ public class AiMessageReviewServiceImpl extends MyBaseServiceImpl<AiMessageRevie
     public AiMessageReviewEntity getByAiMessageId(Long aiMessageId) {
         LambdaQueryWrapper<AiMessageReviewEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AiMessageReviewEntity::getAiMessageId, aiMessageId);
+        wrapper.eq(AiMessageReviewEntity::getOwnerBy, LoginUserUtil.getLoginUser().getId());
         return baseMapper.selectOne(wrapper);
     }
 

ui/smarttrade-platform/src/api/knowledge/index.js

@@ -45,8 +45,12 @@ export const delDocuments = (params = {}) => {
 }
 
 export const createChunk = (data = {}) => {
-    const { dataset_id,document_id, ...query } = data
-    return post(`/router/rest/knowledge/chunk/${dataset_id}/${document_id}`, data)
+    const { dataset_id, document_id, ...segmentItem } = data
+    // 请求体外层包 segments 数组
+    const body = {
+        segments: [segmentItem]
+    }
+    return post(`/router/rest/knowledge/chunk/${dataset_id}/${document_id}`, body)
 }
 
 export const delChunk = (params = {}) => {

ui/smarttrade-platform/src/components/marketing/marketingDetail.vue

@@ -199,12 +199,12 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-secondary" @click="duplicateCampaign(selectedCampaign)">
+          <!-- <button class="btn btn-secondary" @click="duplicateCampaign(selectedCampaign)">
             <i class="fas fa-copy"></i> 复制活动
           </button>
           <button class="btn btn-secondary" @click="exportCampaignReport(selectedCampaign)">
             <i class="fas fa-download"></i> 导出报告
-          </button>
+          </button> -->
           <button class="btn btn-secondary" @click="showCampaignDetailModal = false">关闭</button>
           <button class="btn btn-primary" @click="editCampaign(selectedCampaign)">
             <i class="fas fa-edit"></i> 编辑活动

ui/smarttrade-platform/src/views/KnowledgeView.vue

@@ -527,7 +527,7 @@
           <button class="modal-close" @click="showDetailModal = false"><i class="fas fa-times"></i></button>
         </div>
         <div class="modal-body">
-          <div class="detail-section">
+          <div class="detail-section"  v-if="doc_form=='qa_model'">
             <div class="detail-label"><i class="fas fa-lightbulb"></i> 答案内容</div>
             <div class="detail-content">{{ selectedKnowledge.answer }}</div>
           </div>
@@ -851,14 +851,15 @@ const getCategoryList  = (id,type) => {
     documentsParams.value.keyword = searchQuery.value
     documentsParams.value.pageSize = 10
   }else{
+    documentsParams.value.dataset_id = id?id:''
     documentsParams.value.pageSize = 9999
   }
   getAllDocumnets(documentsParams.value).then(res => {
-    console.log(res)
     if(type=='add'){ //添加知识获取分类
       documentList.value = res.result.data
     }else{
       knowledgeList.value = res.result.data
+      
       tabs.value[1].count = categoryTotal.value = res.result.total
     }
   })
@@ -899,10 +900,11 @@ const getChunkDatasets = () => {
     const apiFn = chunkParams.value.document_id ? getChunks : getAllChunks
     apiFn(chunkParams.value).then(res => {
       chunkLoading.value = false
-      chunkList.value = res.result.data
       res.result.data.forEach(el => {
         el.timeip = formatTimeAgo(el.updated_at)
+        el.dataset_id = chunkParams.value.dataset_id
       });
+      chunkList.value = res.result.data
       chunksTotal.value =  res.result.total
       doc_form.value = res.result.doc_form
     })
@@ -1083,7 +1085,6 @@ const detailDocument = (item) => {
     document_id:item.id,
   }
    getDocumentDetail(params).then(res => {
-    console.log(555)
   })
 }
 
@@ -1099,6 +1100,7 @@ const addKnowledgeDocument = ()=> {
   newKnowledge.value.segment_id=''
   chunkType.value = 'add'
   showAddModal.value = true
+  documentList.value = []
 }
 const addKnowledge = () => {
   if(!newKnowledge.value.answer||!newKnowledge.value.content||!newKnowledge.value.dataset_id||!newKnowledge.value.document_id){
@@ -1108,14 +1110,14 @@ const addKnowledge = () => {
   if(chunkType.value =='add'){
     createChunk(newKnowledge.value).then(res => {
       if(res.success){
-        howToastMessage('知识添加成功，AI 已学习', 'success')
+        showToastMessage('知识添加成功，AI 已学习', 'success')
         showAddModal.value = false
       }
     })
   }else{
     editChunk(newKnowledge.value).then(res => {
       if(res.success){
-        howToastMessage('知识编辑成功，AI 已学习', 'success')
+        showToastMessage('知识编辑成功，AI 已学习', 'success')
         showAddModal.value = false
       }
     })