Merge 94a3da57f3 into 6f497b142e

0 —>0%  but 0.9112->91.12%%

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/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java

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

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java

@@ -109,9 +109,14 @@ public class MetricRepositoryImpl implements MetricRepository {
         }
         if (StringUtils.isNotBlank(metricFilter.getKey())) {
             String key = metricFilter.getKey();
-            queryWrapper.lambda().like(MetricDO::getName, key).or().like(MetricDO::getBizName, key)
-                    .or().like(MetricDO::getDescription, key).or().like(MetricDO::getAlias, key)
-                    .or().like(MetricDO::getCreatedBy, key);
+            queryWrapper.lambda()
+                    .and(wrapper -> wrapper
+                            .like(MetricDO::getName, key)
+                            .or().like(MetricDO::getBizName, key)
+                            .or().like(MetricDO::getDescription, key)
+                            .or().like(MetricDO::getAlias, key)
+                            .or().like(MetricDO::getCreatedBy, key)
+                    );
         }
 
         return metricDOMapper.selectList(queryWrapper);

webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx

@@ -43,8 +43,8 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
                 {`${
                   value
                     ? formatByDataFormatType(value, dataFormatType, dataFormat)
-                    : 0
-                }%`}
+                    : '0%'
+                }`}
               </div>
             );
           }