From 8d87b4142c57eba354722977e7745929d1cbc427 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 3 Dec 2023 15:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/modules/gen/include/dataGridSelectScript.html   | 4 ++--
 .../src/main/resources/views/modules/sys/user/userSelect.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
index b2ea33bc..c47a7299 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
@@ -1,5 +1,5 @@
 <script>
-var selectData = \${isNotBlank(selectData!) ? selectData! : "{\}"},
+var selectData = \"#{isNotBlank(selectData!) ? selectData! : '{}'}",
 selectNum = 0, dataGrid = $('#dataGrid').dataGrid({
 	searchForm: $('#searchForm'),
 	columnModel: [
@@ -81,7 +81,7 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({
 		} %>', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）
 	<% } %>
 	autoGridHeight: function(){
-		var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 74;
+		var height = $(window).height() - $('#searchForm').height() - $('#dataGridPage').height() - 76;
 		$('.tags-input').height($('.ui-jqgrid').height() - 10);
 		return height;
 	},
diff --git a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html
index 6c0321f6..1b58d2df 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/userSelect.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/userSelect.html
@@ -58,7 +58,7 @@
 </div>
 <% } %>
 <script>
-var selectData = ${isNotBlank(selectData!) ? selectData! : "{\}"},
+var selectData = "#{isNotBlank(selectData!) ? selectData! : '{}'}",
 selectNum = 0, dataGrid = $('#dataGrid').dataGrid({
 	searchForm: $('#searchForm'),
 	columnModel: [