From 94f92bf3ecadba9310ba365c2b1465374355b437 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 22 Nov 2017 13:14:44 +0800
Subject: [PATCH] bug fix

---
 pom.xml                                                | 10 ++++++++--
 src/main/webapp/WEB-INF/view/common/_curd/_edit.html   |  2 +-
 .../webapp/WEB-INF/view/common/_curd/_edit_table.html  |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index abafeabe..fc9aef52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
 		<spring.version>4.3.12.RELEASE</spring.version>
 		<shiro.version>1.3.2</shiro.version>
 		<log4j2.version>2.7</log4j2.version>
-		<beetlsql.version>2.9.10</beetlsql.version>
+		<beetlsql.version>2.9.15</beetlsql.version>
+        <beetl.version>2.7.23</beetl.version>
 	</properties>
 
 	<dependencies>
@@ -51,6 +52,11 @@
             <version>${log4j2.version}</version>
         </dependency>
 		<!-- beetl -->
+        <dependency>
+            <groupId>com.ibeetl</groupId>
+            <artifactId>beetl</artifactId>
+            <version>${beetl.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>beetlsql</artifactId>
@@ -183,7 +189,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.40</version>
+			<version>1.2.41</version>
 		</dependency>
 		
 		<!-- qrcode -->
diff --git a/src/main/webapp/WEB-INF/view/common/_curd/_edit.html b/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
index b539e753..50747dd0 100644
--- a/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
+++ b/src/main/webapp/WEB-INF/view/common/_curd/_edit.html
@@ -191,7 +191,7 @@
 					}
 					else if($x.is("span")){
 						var _x = _model[x];
-						if(_x == null || _x == ""){
+						if(_x === null || _x === ""){
 							_x = "请选择";
 						}
 						$x.html(_x);
diff --git a/src/main/webapp/WEB-INF/view/common/_curd/_edit_table.html b/src/main/webapp/WEB-INF/view/common/_curd/_edit_table.html
index 42d347d1..d596e6b8 100644
--- a/src/main/webapp/WEB-INF/view/common/_curd/_edit_table.html
+++ b/src/main/webapp/WEB-INF/view/common/_curd/_edit_table.html
@@ -192,7 +192,7 @@
 					}
 					else if($x.is("span")){
 						var _x = _model[x];
-						if(_x == null || _x == ""){
+						if(_x === null || _x === ""){
 							_x = "请选择";
 						}
 						$x.html(_x);
-- 
GitLab