From 92bd5476c6fe342a0f7d7959d6a4b24aac912193 Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Mon, 26 Sep 2022 15:00:47 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-80583=20=E5=A4=9A=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88=E8=A6=81=E5=BC=B9?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/data/DesignTableDataManager.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index 2b654b6f4..2ce2a7d82 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -625,6 +625,8 @@ public abstract class DesignTableDataManager {
             // 把storeProcedure写成xml文件到out
             DataCoreXmlUtils.writeXMLStoreProcedure(writer, storeProcedure, null);
             if (storeProcedure.getDataModelList().size() > 0 && !storeProcedure.isFirstExpand()) {
+                // 存储过程有些特殊处理
+                // 这个就简单直接获取暂存列表吧
                 return storeProcedure.getDataModelList().toArray(new ProcedureDataModel[0]);
             }
             ParameterProvider[] inParameters = DataOperator.getInstance().getStoreProcedureParameters(storeProcedure);
@@ -633,13 +635,14 @@ public abstract class DesignTableDataManager {
                 showParaWindow(parameterMap, inParameters);
             }
             storeProcedure.setFirstExpand(false);
+        } else {
+            ParameterProvider[] parameters = DataOperator.getInstance().getTableDataParameters(tableData);
+            if (parameters.length > 0) {
+                showParaWindow(parameterMap, parameters);
+            }
         }
 
-        // 存储过程有些特殊处理
-        // 这个就简单直接获取暂存列表吧
         if (needLoadingBar) {
-            ParameterProvider[] parameters = DataOperator.getInstance().getTableDataParameters(tableData);
-            showParaWindow(parameterMap, parameters);
             MultiResultTableDataWrapper.loadingBar.start();
         }
         return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0);