Merge f489ea2f59 into 6f497b142e

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java

@@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -110,6 +109,14 @@ public class MemoryServiceImpl implements MemoryService, CommandLineRunner {
 
     @Override
     public void batchDelete(List<Long> ids) {
+        QueryWrapper<ChatMemoryDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(ChatMemoryDO::getId, ids);
+        List<ChatMemoryDO> chatMemoryDOS = chatMemoryRepository.getMemories(queryWrapper);
+        chatMemoryDOS.forEach(chatMemoryDO -> {
+            if (MemoryStatus.ENABLED.toString().equals(chatMemoryDO.getStatus().trim())) {
+                disableMemory(chatMemoryDO);
+            }
+        });
         chatMemoryRepository.batchDelete(ids);
     }
 

webapp/packages/chat-sdk/src/components/ChatItem/index.tsx

@@ -416,11 +416,10 @@ const ChatItem: React.FC<Props> = ({
 
   const onExportData = () => {
     const { queryColumns, queryResults } = data || {};
-    if (!!queryResults) {
+    if (!!queryResults && !!queryColumns) {
       const exportData = queryResults.map(item => {
-        return Object.keys(item).reduce((result, key) => {
+        return queryColumns.reduce((result, column) => {
-          const columnName = queryColumns?.find(column => column.nameEn === key)?.name || key;
+          result[column.name || column.nameEn] = item[column.nameEn];
-          result[columnName] = item[key];
           return result;
         }, {});
       });