Merge fa65b6eff7 into 2552e2ae4b

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DataInterpretProcessor.java

@@ -46,8 +46,8 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
     public boolean accept(ExecuteContext executeContext) {
         Agent agent = executeContext.getAgent();
         ChatApp chatApp = agent.getChatAppConfig().get(APP_KEY);
-        return Objects.nonNull(chatApp) && chatApp.isEnable()
+        return Objects.nonNull(chatApp) && chatApp.isEnable()&&
-                && StringUtils.isNotBlank(executeContext.getResponse().getTextResult()); // 如果都没结果，则无法处理，直接跳过
+                StringUtils.isNotBlank(executeContext.getResponse().getTextResult()); //  如果都没结果，则无法处理，直接跳过
     }
 
     @Override

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java

@@ -335,11 +335,8 @@ public class S2DataPermissionAspect {
                 if (StringUtils.isNotEmpty(filter.getDescription())) {
                     descList.add(filter.getDescription());
                 }
-                if (!"[]".equals(filter.getExpressions().toString())) {
                 exprList.add(filter.getExpressions().toString());
-                }
             });
-            if (!CollectionUtils.isEmpty(exprList)) {
             String promptInfo = "当前结果已经过行权限过滤，详细过滤条件如下:%s, 申请权限请联系管理员%s";
             String message = String.format(promptInfo,
                     CollectionUtils.isEmpty(descList) ? exprList : descList, admins);
@@ -348,4 +345,3 @@ public class S2DataPermissionAspect {
         }
     }
 }
-}