diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js
index e78391a95..767cc70ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js	
@@ -2203,6 +2203,7 @@
                 dfop.rows = 1000000;
                 data = data || dfop.param || {};
                 dfop.param = data.param || data;
+                dfop.running.pageparam.page = 1;
                 _jfgrid.reload($self, dfop);
                 break;
             case 'refresh':
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js
index a617e48ef..d3bd95e31 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js	
@@ -61,6 +61,12 @@
                                         callBack: function (id) {
                                             return top[id].acceptClick();
                                         },
+                                        end: function () {
+                                            if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) {
+                                                learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30;
+                                                learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload');
+                                            }
+                                        },
                                         btn: ['导出Excel', '关闭']
                                     });
                                 });