JEECG 3.7.2版本发布 - 高级查询改进

README.md

@@ -103,7 +103,6 @@ JEECG
 * 	官方论坛： [http://www.jeecg.org](http://www.jeecg.org)
 * 	官方网站： [http://www.guojusoft.com](http://www.guojusoft.com)
 * 	官方博客： [http://blog.csdn.net/zhangdaiscott](http://blog.csdn.net/zhangdaiscott)
-* 	技术支持： [JEECG社区官方支持QQ群汇总](http://www.jeecg.org/forum.php?mod=viewthread&tid=1249&extra=page%3D1)
 
 
 

src/main/java/org/jeecgframework/tag/ftl/superquery.ftl

@@ -51,7 +51,7 @@
 								<#--update-begin--Author:xuelin  Date:20171108 for：[#2404]【平台UI改造】UI样式改造点--高级查询弹出窗口遮挡 -->
 								<#if '${column.hidden?string("true", "false")}' != "true">
 									<#--update-begin--Author:LiShaoQing  Date:20180110 for：[#2452]【新功能】高级查询，支持popup功能 -->
-									<option value="${column.field}" data-popup="${column.popup}" data-dictionary="${column.dictionary}">${column.title}</option>
+									<option value="${column.field}" data-popup="${column.popup?string}" data-dictionary="${column.dictionary!}">${column.title!}</option>
 									<#--update-end--Author:LiShaoQing  Date:20180110 for：[#2452]【新功能】高级查询，支持popup功能 -->
 								</#if>
 								<#--update-end--Author:xuelin  Date:20171108 for：[#2404]【平台UI改造】UI样式改造点--高级查询弹出窗口遮挡 -->
@@ -106,7 +106,7 @@
 							<#list fields as column>
 							<#--update-begin--Author:xuelin  Date:20171108 for：[#2404]【平台UI改造】UI样式改造点--高级查询弹出窗口遮挡 -->
 								<#if '${column.hidden?string("true", "false")}' != "true">
-									<option value="${column.field}" data-popup="${column.popup}" data-dictionary="${column.dictionary}">${column.title}</option>
+									<option value="${column.field}" data-popup="${column.popup?string}" data-dictionary="${column.dictionary!}">${column.title!}</option>
 								</#if>
 							<#--update-end--Author:xuelin  Date:20171108 for：[#2404]【平台UI改造】UI样式改造点--高级查询弹出窗口遮挡 -->
 							</#list>

src/main/resources/dbconfig.properties

@@ -18,9 +18,9 @@
 #MySQL
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
 validationQuery.sqlserver=SELECT 1
-jdbc.url.jeecg=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8
-jdbc.username.jeecg=guoju
-jdbc.password.jeecg=guoju123123
+jdbc.url.jeecg=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8
+jdbc.username.jeecg=root
+jdbc.password.jeecg=root
 jdbc.dbType=mysql
 
 #Oracle

src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql 
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8
-username=guoju
-password=guoju123123
-database_name=jeecg_3.7.2
+url=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8
+username=root
+password=root
+database_name=jeecg
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver