Merge b80db694c5 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);
     }
 

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java

@@ -129,7 +129,7 @@ public abstract class BaseMapper implements SchemaMapper {
         Map<MatchText, List<T>> matchResult = matchStrategy.match(chatQueryContext, terms,
                 chatQueryContext.getRequest().getDataSetIds());
         List<T> matches = new ArrayList<>();
-        if (Objects.isNull(matchResult)) {
+        if (Objects.isNull(matchResult) || matchResult.isEmpty()) {
             return matches;
         }
         Optional<List<T>> first = matchResult.entrySet().stream()