diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index cda298a5..e18e40dd 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -103,9 +103,11 @@ $(function() {
 		}).bind("input propertychange", $.tree.searchNode);
 	}
 	// tree表格树 展开/折叠
-	var expandFlag = false;
+	var expandFlag;
 	$("#expandAllBtn").click(function() {
-	    if (expandFlag) {
+		var dataExpand = $.common.isEmpty($.table._option.expandAll) ? true : $.table._option.expandAll;
+		expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag;
+	    if (!expandFlag) {
 	        $('#' + $.table._option.id).bootstrapTreeTable('expandAll');
 	    } else {
 	        $('#' + $.table._option.id).bootstrapTreeTable('collapseAll');
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
index 786cc7b6..68786089 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
@@ -59,7 +59,7 @@
 		        parentCode: "parentId",
 		        uniqueId: "menuId",
 		        expandAll: false,
-		        expandFirst: true,
+		        expandFirst: false,
 		        url: prefix + "/list",
 		        createUrl: prefix + "/add/{id}",
 		        updateUrl: prefix + "/edit/{id}",