无jira 解决冲突

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java

@@ -11,10 +11,14 @@ import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
 import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider;
 import com.fr.file.filetree.FileNode;
+import com.fr.file.filetree.FileNodes;
 import com.fr.general.ComparatorUtils;
 import com.fr.json.JSONObject;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
+import com.fr.workspace.WorkContext;
 
 
 /**
@@ -74,7 +78,12 @@ public class FileSearchManager implements AlphaFineSearchProvider {
                 return lessModelList;
             }
             AlphaFineHelper.checkCancel();
-            fileNodes = FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true);
+            fileNodes = WorkContext.getCurrent().get(FileNodes.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    return FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true);
+                }
+            }).list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true, false);
             isContainCpt = true;
             isContainFrm = true;
             doSearch(this.searchText);
@@ -128,7 +137,12 @@ public class FileSearchManager implements AlphaFineSearchProvider {
      */
     private void doFileContentSearch(String searchText) {
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainFileContent()) {
-            FileNode[] fileNodes = FRContext.getFileNodes().filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true);
+            FileNode[] fileNodes =  WorkContext.getCurrent().get(FileNodes.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    return FRContext.getFileNodes().filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true);
+                }
+            }).filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true, false);
             for (FileNode node : fileNodes) {
                 FileModel model = new FileModel(node.getName(), node.getEnvPath());
                 if (!AlphaFineHelper.getFilterResult().contains(model) && !filterModelList.contains(model)) {