From b1902b8addafcb8e8879323842a101d94aa5995b Mon Sep 17 00:00:00 2001
From: Ponfee <ponfee.cn@gmail.com>
Date: Thu, 27 Jul 2023 01:24:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#I7OB0S=20treeTable=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E4=BF=A1=E6=81=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bootstrap-table/extensions/tree/bootstrap-table-tree.js  | 5 +++++
 ruoyi-admin/src/main/resources/templates/include.html        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
index c234ad6bd..c86a56be5 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js
@@ -217,6 +217,8 @@
             if (!data || data.length <= 0) {
                 var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>'
                 $tbody.html(_empty);
+                options.pageNumber = 1;
+                initPagination(0, 0);
                 return;
             }
             // 缓存并格式化数据
@@ -272,6 +274,9 @@
             if (pageTo > target.totalRows) {
                 pageTo = target.totalRows;
             }
+            if (pageFrom > pageTo) {
+                pageFrom = pageTo;
+            }
             html.push('<div class="pull-left pagination-detail">');
             html.push('<span class="pagination-info">' + formatShowingRows(pageFrom, pageTo, target.totalRows) + '</span>');
             var pageList = false;
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index d4aa4a8a1..5b0ed0596 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -30,7 +30,7 @@
 	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script>
 	<script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script>
 	<!-- bootstrap-table 表格树插件 -->
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js?v=1.18.3}"></script>
 	<!-- 遮罩层 -->
 	<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>