Merge 9db9718e88 into 79a44b27ee

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

@@ -26,6 +26,7 @@ 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;
@@ -109,14 +110,6 @@ 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/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java

@@ -83,10 +83,10 @@ public class DimensionRepositoryImpl implements DimensionRepository {
         }
         if (StringUtils.isNotBlank(dimensionFilter.getKey())) {
             String key = dimensionFilter.getKey();
-            queryWrapper.and(qw->qw.lambda().like(DimensionDO::getName, key).or()
+            queryWrapper.lambda().like(DimensionDO::getName, key).or()
                     .like(DimensionDO::getBizName, key).or().like(DimensionDO::getDescription, key)
                     .or().like(DimensionDO::getAlias, key).or()
-                    .like(DimensionDO::getCreatedBy, key));
+                    .like(DimensionDO::getCreatedBy, key);
         }
 
         return dimensionDOMapper.selectList(queryWrapper);