diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
index da44fa510f..d2befc90c8 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
@@ -124,7 +124,10 @@ public class ContentCellRender implements ListCellRenderer<Object> {
     private String getReplacedString(String modelName, String string) {
         //需要考虑modelName有空格的情况
         //比如现在是work boo k 搜索词是workb,应该要替换的部分是work b
-        //先去掉空格进行匹配
+        //先去掉已经匹配替换过的部分,因为考虑到分词的情况,可能会进行多次替换
+        final String regex = "\\|<font.*?</font>\\|";
+        modelName = modelName.replaceAll(regex, StringUtils.EMPTY);
+        //再去掉空格进行匹配
         String noBlackName = modelName.replaceAll(StringUtils.BLANK, StringUtils.EMPTY).toLowerCase();
         int index = noBlackName.indexOf(string.toLowerCase());
         if (index == -1) {
@@ -141,4 +144,5 @@ public class ContentCellRender implements ListCellRenderer<Object> {
     }
 
 
+
 }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
index d3bd1f6370..0497828c7e 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
@@ -112,7 +112,7 @@ public class FileSearchManager implements AlphaFineSearchProvider {
                 name = name.replaceAll(StringUtils.BLANK, StringUtils.EMPTY);
                 if (name.contains(searchText)) {
                     FileModel model = new FileModel(node.getName(), node.getEnvPath());
-                    if (!AlphaFineHelper.getFilterResult().contains(model)) {
+                    if (!AlphaFineHelper.getFilterResult().contains(model) && !filterModelList.contains(model)) {
                         AlphaFineHelper.checkCancel();
                         filterModelList.add(model);
                     }
diff --git a/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRenderTest.java b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRenderTest.java
index 9daa70f3a0..d5f3a8206e 100644
--- a/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRenderTest.java
+++ b/designer-realize/src/test/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRenderTest.java
@@ -1,7 +1,9 @@
 package com.fr.design.mainframe.alphafine.cell.render;
 
+import com.fr.stable.StringUtils;
 import org.junit.Test;
 
+
 import static org.junit.Assert.*;
 
 /**
@@ -13,11 +15,20 @@ public class ContentCellRenderTest {
 
     @Test
     public void highLightModelName() {
+        final String regex = "<font.*?</font>";
         String searchText = "workb";
         ContentCellRender contentCellRender = new ContentCellRender(searchText,new String[]{searchText});
         String workbook = contentCellRender.highLightModelName("workbook", new String[]{searchText});
         assertTrue(workbook.endsWith("workb</font>ook</body></HTML>"));
         workbook = contentCellRender.highLightModelName("work book", new String[]{searchText});
         assertTrue(workbook.endsWith("work b</font>ook</body></HTML>"));
+
+        searchText = "我是空格";
+        contentCellRender = new ContentCellRender(searchText, new String[]{"我是空格", "我是", "空格"});
+        workbook = contentCellRender.highLightModelName("我是 空格", new String[]{searchText});
+        assertEquals(workbook.replaceFirst(regex, StringUtils.EMPTY), workbook.replaceAll(regex, StringUtils.EMPTY));
+
+        workbook = contentCellRender.highLightModelName("我是是 空格", new String[]{"我是空格", "我是", "空格"});
+        assertNotEquals(workbook.replaceFirst(regex, StringUtils.EMPTY), workbook.replaceAll(regex, StringUtils.EMPTY));
     }
 }
\ No newline at end of file