diff --git a/modules/cms/src/main/resources/views/modules/cms/articleList.html b/modules/cms/src/main/resources/views/modules/cms/articleList.html
index 8499485e..fe0be0d2 100644
--- a/modules/cms/src/main/resources/views/modules/cms/articleList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html
@@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({
 // 		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('cms:article:edit')){ %>
+			//<% if(hasPermi('cms:article:edit')){ %>
 				actions.push('<a href="${ctx}/cms/article/form?id='+row.id+'" class="btnList" title="${text("编辑文章")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/cms/article/disable?id='+row.id+'" class="btnList" title="${text("停用文章")}" data-confirm="${text("确认要停用该文章吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -82,7 +82,7 @@ $('#dataGrid').dataGrid({
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctxFront}/view-'+row.category.categoryCode+'-'+row.id+'" target="_blank" title="${text("预览文章")}"><i class="fa fa-globe"></i></a>&nbsp;');
 				}
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryList.html b/modules/cms/src/main/resources/views/modules/cms/categoryList.html
index 391df42e..dff056b4 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryList.html
@@ -87,7 +87,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('cms:category:edit')){ %>
+			//<% if(hasPermi('cms:category:edit')){ %>
 				actions.push('<a href="${ctx}/cms/category/form?categoryCode='+row.categoryCode+'" class="btnList" title="${text("编辑栏目表")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/cms/category/disable?categoryCode='+row.categoryCode+'" class="btnList" title="${text("停用栏目表")}" data-confirm="${text("确认要停用该栏目表吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -100,7 +100,7 @@ $('#dataGrid').dataGrid({
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctxFront}/list-'+row.categoryCode+'" target="_blank" title="${text("访问栏目")}"><i class="fa fa-globe"></i></a>&nbsp;');
 				}
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/cms/src/main/resources/views/modules/cms/commentList.html b/modules/cms/src/main/resources/views/modules/cms/commentList.html
index a1f70a02..8ba19011 100644
--- a/modules/cms/src/main/resources/views/modules/cms/commentList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/commentList.html
@@ -1,18 +1,18 @@
-<% layout('/layouts/default.html', {title: '文章评论表管理', libs: ['dataGrid']}){ %>
-<div class="main-content">
-	<div class="box box-main">
-		<div class="box-header">
-			<div class="box-title">
-				<i class="fa fa-list-alt"></i> ${text('文章评论表管理')}
-			</div>
-			<div class="box-tools pull-right">
-				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
-				<% if(hasPermi('cms:comment:edit')){ %>
-					<a href="${ctx}/cms/comment/form" class="btn btn-default btnTool" title="${text('新增文章评论表')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
-				<% } %>
-			</div>
-		</div>
-		<div class="box-body">
+<% layout('/layouts/default.html', {title: '文章评论表管理', libs: ['dataGrid']}){ %>
+<div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa fa-list-alt"></i> ${text('文章评论表管理')}
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
+				<% if(hasPermi('cms:comment:edit')){ %>
+					<a href="${ctx}/cms/comment/form" class="btn btn-default btnTool" title="${text('新增文章评论表')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
+				<% } %>
+			</div>
+		</div>
+		<div class="box-body">
 			<#form:form id="searchForm" model="${comment}" action="${ctx}/cms/comment/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 				<div class="form-group">
@@ -98,53 +98,53 @@
 					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>
 			</#form:form>
-			<table id="dataGrid"></table>
-			<div id="dataGridPage"></div>
-		</div>
-	</div>
-</div>
-<% } %>
-<script>
-// 初始化DataGrid对象
-$('#dataGrid').dataGrid({
-	searchForm: $("#searchForm"),
-	columnModel: [
-		{header:'${text('栏目编码')}', name:'categoryCode', index:'a.category_code', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '<a href="${ctx}/cms/comment/form?id='+row.id+'" class="btnList" data-title="${text('编辑文章评论表')}">'+(val||row.id)+'</a>';
-		}},
-		{header:'${text('内容编号')}', name:'articleId', index:'a.article_id', width:150, align:"left"},
-		{header:'${text('父级评论')}', name:'parentId', index:'a.parent_id', width:150, align:"left"},
-		{header:'${text('内容标题')}', name:'articleTitle', index:'a.article_title', width:150, align:"left"},
-		{header:'${text('评论内容')}', name:'content', index:'a.content', width:150, align:"left"},
-		{header:'${text('评论姓名')}', name:'name', index:'a.name', width:150, align:"left"},
-		{header:'${text('评论IP')}', name:'ip', index:'a.ip', width:150, align:"left"},
-		{header:'${text('创建时间')}', name:'createDate', index:'a.create_date', width:150, align:"center"},
-		{header:'${text('审核人')}', name:'auditUserCode', index:'a.audit_user_code', width:150, align:"left"},
-		{header:'${text('审核时间')}', name:'auditDate', index:'a.audit_date', width:150, align:"center"},
-		{header:'${text('审核意见')}', name:'auditComment', index:'a.audit_comment', width:150, align:"left"},
-		{header:'${text('支持数')}', name:'hitsPlus', index:'a.hits_plus', width:150, align:"center"},
-		{header:'${text('反对数')}', name:'hitsMinus', index:'a.hits_minus', width:150, align:"center"},
-		{header:'${text('状态')}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
-			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text('未知')}', true);
-		}},
-		{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
-			var actions = [];
-			<% if(hasPermi('cms:comment:edit')){ %>
-				actions.push('<a href="${ctx}/cms/comment/form?id='+row.id+'" class="btnList" title="${text('编辑文章评论表')}"><i class="fa fa-pencil"></i></a>&nbsp;');
-				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="${ctx}/cms/comment/disable?id='+row.id+'" class="btnList" title="${text('停用文章评论表')}" data-confirm="${text('确认要停用该文章评论表吗？')}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
-				}
-				if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="${ctx}/cms/comment/enable?id='+row.id+'" class="btnList" title="${text('启用文章评论表')}" data-confirm="${text('确认要启用该文章评论表吗？')}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
-				}
-				actions.push('<a href="${ctx}/cms/comment/delete?id='+row.id+'" class="btnList" title="${text('删除文章评论表')}" data-confirm="${text('确认要删除该文章评论表吗？')}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
-			return actions.join('');
-		}}
-	],
-	// 加载成功后执行事件
-	ajaxSuccess: function(data){
-		
-	}
-});
+			<table id="dataGrid"></table>
+			<div id="dataGridPage"></div>
+		</div>
+	</div>
+</div>
+<% } %>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'${text('栏目编码')}', name:'categoryCode', index:'a.category_code', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '<a href="${ctx}/cms/comment/form?id='+row.id+'" class="btnList" data-title="${text('编辑文章评论表')}">'+(val||row.id)+'</a>';
+		}},
+		{header:'${text('内容编号')}', name:'articleId', index:'a.article_id', width:150, align:"left"},
+		{header:'${text('父级评论')}', name:'parentId', index:'a.parent_id', width:150, align:"left"},
+		{header:'${text('内容标题')}', name:'articleTitle', index:'a.article_title', width:150, align:"left"},
+		{header:'${text('评论内容')}', name:'content', index:'a.content', width:150, align:"left"},
+		{header:'${text('评论姓名')}', name:'name', index:'a.name', width:150, align:"left"},
+		{header:'${text('评论IP')}', name:'ip', index:'a.ip', width:150, align:"left"},
+		{header:'${text('创建时间')}', name:'createDate', index:'a.create_date', width:150, align:"center"},
+		{header:'${text('审核人')}', name:'auditUserCode', index:'a.audit_user_code', width:150, align:"left"},
+		{header:'${text('审核时间')}', name:'auditDate', index:'a.audit_date', width:150, align:"center"},
+		{header:'${text('审核意见')}', name:'auditComment', index:'a.audit_comment', width:150, align:"left"},
+		{header:'${text('支持数')}', name:'hitsPlus', index:'a.hits_plus', width:150, align:"center"},
+		{header:'${text('反对数')}', name:'hitsMinus', index:'a.hits_minus', width:150, align:"center"},
+		{header:'${text('状态')}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text('未知')}', true);
+		}},
+		{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
+			var actions = [];
+			//<% if(hasPermi('cms:comment:edit')){ %>
+				actions.push('<a href="${ctx}/cms/comment/form?id='+row.id+'" class="btnList" title="${text('编辑文章评论表')}"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == Global.STATUS_NORMAL){
+					actions.push('<a href="${ctx}/cms/comment/disable?id='+row.id+'" class="btnList" title="${text('停用文章评论表')}" data-confirm="${text('确认要停用该文章评论表吗？')}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				}
+				if (row.status == Global.STATUS_DISABLE){
+					actions.push('<a href="${ctx}/cms/comment/enable?id='+row.id+'" class="btnList" title="${text('启用文章评论表')}" data-confirm="${text('确认要启用该文章评论表吗？')}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="${ctx}/cms/comment/delete?id='+row.id+'" class="btnList" title="${text('删除文章评论表')}" data-confirm="${text('确认要删除该文章评论表吗？')}"><i class="fa fa-trash-o"></i></a>&nbsp;');
+			//<% } %>
+			return actions.join('');
+		}}
+	],
+	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
 </script>
\ No newline at end of file
diff --git a/modules/cms/src/main/resources/views/modules/cms/reportList.html b/modules/cms/src/main/resources/views/modules/cms/reportList.html
index a912d99f..f2672eac 100644
--- a/modules/cms/src/main/resources/views/modules/cms/reportList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/reportList.html
@@ -13,43 +13,43 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${report}" action="${ctx}/cms/report/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('举报来源')}：</label>
-					<div class="control-inline">
-						<#form:input path="reportSource" maxlength="1" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('举报内容')}：</label>
-					<div class="control-inline">
-						<#form:input path="reportContent" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('举报的URL')}：</label>
-					<div class="control-inline">
-						<#form:input path="reportUrl" maxlength="1000" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('举报类型')}：</label>
-					<div class="control-inline">
-						<#form:input path="reportType" maxlength="1" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('举报原因')}：</label>
-					<div class="control-inline">
-						<#form:input path="reportCause" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
-			</#form:form>
+			<#form:form id="searchForm" model="${report}" action="${ctx}/cms/report/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('举报来源')}：</label>
+					<div class="control-inline">
+						<#form:input path="reportSource" maxlength="1" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('举报内容')}：</label>
+					<div class="control-inline">
+						<#form:input path="reportContent" maxlength="500" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('举报的URL')}：</label>
+					<div class="control-inline">
+						<#form:input path="reportUrl" maxlength="1000" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('举报类型')}：</label>
+					<div class="control-inline">
+						<#form:input path="reportType" maxlength="1" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('举报原因')}：</label>
+					<div class="control-inline">
+						<#form:input path="reportCause" maxlength="500" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
 		</div>
@@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text('举报原因')}', name:'reportCause', index:'a.report_cause', width:150, align:"left"},
 		{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('cms:report:edit')){ %>
+			//<% if(hasPermi('cms:report:edit')){ %>
 				actions.push('<a href="${ctx}/cms/report/form?id='+row.id+'" class="btnList" title="${text('编辑内容举报表')}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/cms/report/disable?id='+row.id+'" class="btnList" title="${text('停用内容举报表')}" data-confirm="${text('确认要停用该内容举报表吗？')}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -79,7 +79,7 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/cms/report/enable?id='+row.id+'" class="btnList" title="${text('启用内容举报表')}" data-confirm="${text('确认要启用该内容举报表吗？')}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/cms/report/delete?id='+row.id+'" class="btnList" title="${text('删除内容举报表')}" data-confirm="${text('确认要删除该内容举报表吗？')}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/cms/src/main/resources/views/modules/cms/siteList.html b/modules/cms/src/main/resources/views/modules/cms/siteList.html
index d649d341..1271ff32 100644
--- a/modules/cms/src/main/resources/views/modules/cms/siteList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/siteList.html
@@ -13,37 +13,37 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${site}" action="${ctx}/cms/site/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('站点名称')}：</label>
-					<div class="control-inline">
-						<#form:input path="siteName" maxlength="100" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('站点标题')}：</label>
-					<div class="control-inline">
-						<#form:input path="title" maxlength="100" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('站点域名')}：</label>
-					<div class="control-inline">
-						<#form:input path="domain" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('状态')}：</label>
-					<div class="control-inline width-90">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
-			</#form:form>
+			<#form:form id="searchForm" model="${site}" action="${ctx}/cms/site/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('站点名称')}：</label>
+					<div class="control-inline">
+						<#form:input path="siteName" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('站点标题')}：</label>
+					<div class="control-inline">
+						<#form:input path="title" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('站点域名')}：</label>
+					<div class="control-inline">
+						<#form:input path="domain" maxlength="500" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('状态')}：</label>
+					<div class="control-inline width-90">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
 		</div>
@@ -69,7 +69,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('cms:site:edit')){ %>
+			//<% if(hasPermi('cms:site:edit')){ %>
 				actions.push('<a href="${ctx}/cms/site/form?siteCode='+row.siteCode+'" class="btnList" title="${text("编辑站点")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/cms/site/disable?siteCode='+row.siteCode+'" class="btnList" title="${text("停用站点")}" data-confirm="${text("确认要停用该站点吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -81,7 +81,7 @@ $('#dataGrid').dataGrid({
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctxFront}/index-'+row.siteCode+'" target="_blank" title="${text("访问站点")}"><i class="fa fa-globe"></i></a>&nbsp;');
 				}
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
index 8463bc5a..0bf549e8 100644
--- a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
@@ -13,50 +13,50 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${visitLog}" action="${ctx}/cms/visitLog/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('请求的URL地址')}：</label>
-					<div class="control-inline">
-						<#form:input path="requestUrl" maxlength="1000" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('受访域名')}：</label>
-					<div class="control-inline">
-						<#form:input path="requestUrlHost" maxlength="128" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('来源页面/上一个页面')}：</label>
-					<div class="control-inline">
-						<#form:input path="sourceReferer" maxlength="1000" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('来源域名')}：</label>
-					<div class="control-inline">
-						<#form:input path="sourceRefererHost" maxlength="128" class="form-control width-120"/>
-					</div>
-				</div>
-				
-				<div class="form-group">
-					<label class="control-label">${text('搜索的关键词')}：</label>
-					<div class="control-inline">
-						<#form:input path="searchWord" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				
-				
-				
-				
-			
-				
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
-			</#form:form>
+			<#form:form id="searchForm" model="${visitLog}" action="${ctx}/cms/visitLog/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('请求的URL地址')}：</label>
+					<div class="control-inline">
+						<#form:input path="requestUrl" maxlength="1000" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('受访域名')}：</label>
+					<div class="control-inline">
+						<#form:input path="requestUrlHost" maxlength="128" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('来源页面/上一个页面')}：</label>
+					<div class="control-inline">
+						<#form:input path="sourceReferer" maxlength="1000" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('来源域名')}：</label>
+					<div class="control-inline">
+						<#form:input path="sourceRefererHost" maxlength="128" class="form-control width-120"/>
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="control-label">${text('搜索的关键词')}：</label>
+					<div class="control-inline">
+						<#form:input path="searchWord" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				
+				
+				
+				
+			
+				
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+			</#form:form>
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
 		</div>
@@ -91,7 +91,7 @@ $('#dataGrid').dataGrid({
 
 		{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('cms:visitLog:edit')){ %>
+			//<% if(hasPermi('cms:visitLog:edit')){ %>
 				actions.push('<a href="${ctx}/cms/visitLog/form?id='+row.id+'" class="btnList" title="${text('编辑访问日志表')}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/cms/visitLog/disable?id='+row.id+'" class="btnList" title="${text('停用访问日志表')}" data-confirm="${text('确认要停用该访问日志表吗？')}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -100,7 +100,7 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/cms/visitLog/enable?id='+row.id+'" class="btnList" title="${text('启用访问日志表')}" data-confirm="${text('确认要启用该访问日志表吗？')}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/cms/visitLog/delete?id='+row.id+'" class="btnList" title="${text('删除访问日志表')}" data-confirm="${text('确认要删除该访问日志表吗？')}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
index 4b611651..642a27ed 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
@@ -75,7 +75,7 @@ $('#dataGrid').dataGrid({
 			<% if(isQueryTpl){ %>
 			actions.push('<a href="\${ctx}/${urlPrefix}/form?${idParam}" class="btnList" title="\${text("查看${functionNameSimple}")}"><i class="fa fa-file-text-o"></i></a>&nbsp;');
 			<% }else{ %>
-			\<% if(hasPermi('${permissionPrefix}:edit')){ %>
+			//\<% if(hasPermi('${permissionPrefix}:edit')){ %>
 				actions.push('<a href="\${ctx}/${urlPrefix}/form?${idParam}" class="btnList" title="\${text("编辑${functionNameSimple}")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				<% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
 				if (row.status == Global.STATUS_NORMAL){
@@ -90,7 +90,7 @@ $('#dataGrid').dataGrid({
 				<% if(table.isTreeEntity){ %>
 				actions.push('<a href="\${ctx}/${urlPrefix}/form?parentCode='+row.id+'" class="btnList" title="\${text("新增下级${functionNameSimple}")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
 				<% } %>
-			\<% } %>
+			//\<% } %>
 			<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 			if (row.status != Global.STATUS_DRAFT){
 				actions.push('<a href="\${ctx}/bpm/bpmRuntime/trace?formKey=${table.optionMap['bpmFormKey']}&bizKey='+row.id+'" class="btnList" title="\${text("流程追踪")}" data-layer="true"><i class="fa fa-file-picture-o"></i></a>&nbsp;');
diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html
index 0f4aa071..a91d1ec1 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaList.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaList.html
@@ -67,7 +67,7 @@ $('#dataGrid').dataGrid({
 		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
 		{header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:area:edit')){ %>
+			//<% if(hasPermi('sys:area:edit')){ %>
 				actions.push('<a href="${ctx}/sys/area/form?areaCode='+row.areaCode+'" class="btnList" title="编辑区域"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/area/disable?areaCode='+row.areaCode+'" class="btnList" title="停用区域" data-confirm="确认要停用该区域吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -76,7 +76,7 @@ $('#dataGrid').dataGrid({
 				}
 				actions.push('<a href="${ctx}/sys/area/delete?areaCode='+row.areaCode+'" class="btnList" title="删除区域" data-confirm="确认要删除该区域及所有子区域吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/sys/area/form?parentCode='+row.id+'" class="btnList" title="新增下级区域"><i class="fa fa-plus-square"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html
index abb6fedf..64dec2cf 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyList.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyList.html
@@ -17,8 +17,8 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+			<#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 				<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
 				<#form:hidden path="companyCode" class="isReset"/>
 				<div class="form-group">
@@ -27,28 +27,28 @@
 						<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
 					</div>
 				</div>
-				<div class="form-group">
-					<label class="control-label">${text('公司名称')}：</label>
-					<div class="control-inline">
-						<#form:input path="companyName" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('公司全称')}：</label>
-					<div class="control-inline">
-						<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('状态')}：</label>
-					<div class="control-inline width-60">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
+				<div class="form-group">
+					<label class="control-label">${text('公司名称')}：</label>
+					<div class="control-inline">
+						<#form:input path="companyName" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('公司全称')}：</label>
+					<div class="control-inline">
+						<#form:input path="fullName" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('状态')}：</label>
+					<div class="control-inline width-60">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
 		</div>
@@ -73,7 +73,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:company:edit')){ %>
+			//<% if(hasPermi('sys:company:edit')){ %>
 				actions.push('<a href="${ctx}/sys/company/form?companyCode='+row.companyCode+'" class="btnList" title="${text("编辑公司")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/company/disable?companyCode='+row.companyCode+'" class="btnList" title="${text("停用公司")}" data-confirm="${text("确认要停用该公司吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -82,7 +82,7 @@ $('#dataGrid').dataGrid({
 				}
 				actions.push('<a href="${ctx}/sys/company/delete?companyCode='+row.companyCode+'" class="btnList" title="${text("删除公司")}" data-confirm="${text("确认要删除该公司及所有子公司吗？")}" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/sys/company/form?parentCode='+row.id+'" class="btnList" title="${text("新增下级公司")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html
index 86114e53..f1a23314 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeList.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeList.html
@@ -19,44 +19,44 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
 				<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
 				<#form:hidden path="officeCode" class="isReset"/>
-				<div class="form-group">
-					<label class="control-label">${text('机构代码')}：</label>
-					<div class="control-inline">
-						<#form:input path="viewCode" maxlength="100" class="form-control width-90"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('机构名称')}：</label>
+				<div class="form-group">
+					<label class="control-label">${text('机构代码')}：</label>
 					<div class="control-inline">
-						<#form:input path="officeName" maxlength="100" class="form-control width-90"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('机构全称')}：</label>
-					<div class="control-inline">
-						<#form:input path="fullName" maxlength="200" class="form-control width-90"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('机构类型')}：</label>
-					<div class="control-inline width-90">
-						<#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('状态')}：</label>
-					<div class="control-inline width-60">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
+						<#form:input path="viewCode" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('机构名称')}：</label>
+					<div class="control-inline">
+						<#form:input path="officeName" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('机构全称')}：</label>
+					<div class="control-inline">
+						<#form:input path="fullName" maxlength="200" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('机构类型')}：</label>
+					<div class="control-inline width-90">
+						<#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('状态')}：</label>
+					<div class="control-inline width-60">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
 		</div>
@@ -83,7 +83,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:office:edit')){ %>
+			//<% if(hasPermi('sys:office:edit')){ %>
 				actions.push('<a href="${ctx}/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="${text("编辑机构")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="${text("停用机构")}" data-confirm="${text("确认要停用该机构吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -92,7 +92,7 @@ $('#dataGrid').dataGrid({
 				}
 				actions.push('<a href="${ctx}/sys/office/delete?officeCode='+row.officeCode+'" class="btnList" title="${text("删除机构")}" data-confirm="${text("确认要删除该机构及所有子机构吗？")}" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/sys/office/form?parentCode='+row.id+'" class="btnList" title="${text("新增下级机构")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html
index 2820235f..d567641f 100644
--- a/modules/core/src/main/resources/views/modules/sys/onlineList.html
+++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html
@@ -61,13 +61,13 @@ $('#dataGrid').dataGrid({
 		{header:'${text("设备类型")}', name:'deviceType', width:50, align:'center', formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, '${text('未设置')}', true);
 		}}
-		<% if(hasPermi('sys:online:edit')){ %>
+		//<% if(hasPermi('sys:online:edit')){ %>
 		,{header:'${text("操作")}', name:'actions', width:100, sortable:false, formatter: function(val, obj, row, act){
 			var actions = [];
 			actions.push('<a href="${ctx}/sys/online/tickOut?sessionId='+row.id+'" class="btnList" title="${text("踢出在线用户")}" data-confirm="${text("确认要踢出该用户在线状态吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
 			return actions.join('');
 		}}
-		<% } %>
+		//<% } %>
 	],
 	// 加载成功后执行事件
 	ajaxSuccess: function(data){
diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html
index 0cea7b8c..55475762 100644
--- a/modules/core/src/main/resources/views/modules/sys/postList.html
+++ b/modules/core/src/main/resources/views/modules/sys/postList.html
@@ -14,36 +14,36 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('岗位编码')}：</label>
-					<div class="control-inline">
-						<#form:input path="postCode" maxlength="64" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('岗位名称')}：</label>
-					<div class="control-inline">
-						<#form:input path="postName_like" maxlength="100" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('岗位分类')}：</label>
-					<div class="control-inline width-90">
-						<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/>
-					</div>
+			<#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('岗位编码')}：</label>
+					<div class="control-inline">
+						<#form:input path="postCode" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('岗位名称')}：</label>
+					<div class="control-inline">
+						<#form:input path="postName_like" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('岗位分类')}：</label>
+					<div class="control-inline width-90">
+						<#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/>
+					</div>
 				</div>
 				<div class="form-group">
 					<label class="control-label">${text('状态')}：</label>
 					<div class="control-inline width-60">
 						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
 					</div>
-				</div>
+				</div>
 				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
-				</div>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
@@ -71,7 +71,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:post:edit')){ %>
+			//<% if(hasPermi('sys:post:edit')){ %>
 				actions.push('<a href="${ctx}/sys/post/form?postCode='+row.postCode+'" class="btnList" title="${text("编辑岗位")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/post/disable?postCode='+row.postCode+'" class="btnList" title="${text("停用岗位")}" data-confirm="${text("确认要停用该岗位吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -79,7 +79,7 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/sys/post/enable?postCode='+row.postCode+'" class="btnList" title="${text("启用岗位")}" data-confirm="${text("确认要启用该岗位吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/sys/post/delete?postCode='+row.postCode+'" class="btnList" title="${text("删除岗位")}" data-confirm="${text("确认要删除该岗位吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
index 69d7b331..64dcccae 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
@@ -175,9 +175,9 @@ $('#corpCode_').change(function(){
 var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
 	postData: [
-<%// 	{name:'userType',value:'employee'}, // 指定用户类型的角色 %>
-<%// 	{name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} 		// 过滤可管理的角色 %>
-		{name:'isAll',value:'true'} 	<%  // 显示所有角色（与上方两个条件互斥） %>
+//<%// 	{name:'userType',value:'employee'}, // 指定用户类型的角色 %>
+//<%// 	{name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} 		// 过滤可管理的角色 %>
+		{name:'isAll',value:'true'} 	//<%  // 显示所有角色（与上方两个条件互斥） %>
 	],
 	columnModel: [
 		{header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"},
@@ -203,9 +203,9 @@ var roleGrid = $("#roleGrid").dataGrid({
 		}
 	},
 	ajaxSuccess: function(){
-		<% for (role in roleList!){ %>
+		//<% for (role in roleList!){ %>
  		roleGrid.dataGrid('setSelectRow', '${role.roleCode}');
-		<% } %>
+		//<% } %>
 	}
 });
 </script>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
index 8c139639..14c4ebe3 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
@@ -70,12 +70,12 @@ $('#dataGrid').dataGrid({
 			return '<a href="${ctx}/sys/corpAdmin/form?userCode='+row.userCode+'&op=edit" class="btnList" data-title="${text("编辑用户")}">'+(val||row.id)+'</a>';
 		}},
 		{header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:200, align:"center"},
-		<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %>
+		//<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %>
 		{header:'${text("租户代码")}', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){
 			return '<a href="javascript:" onclick="$(\'#corpCode_\').val(\''+val+'\');$(\'#searchForm\').submit()">'+val+'</a>';
 		}},
 		{header:'${text("租户名称")}', name:'corpName_', index:'a.corp_name', width:200, align:"center"},
-		<% } %>
+		//<% } %>
 		{header:'${text("电子邮箱")}', name:'email', index:'a.email', width:200, align:"center"},
 		{header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:200, align:"center"},
 		{header:'${text("办公电话")}', name:'phone', index:'a.phone', width:200, align:"center"},
@@ -85,7 +85,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:corpAdmin:edit')){ %>
+			//<% if(hasPermi('sys:corpAdmin:edit')){ %>
 				actions.push('<a href="${ctx}/sys/corpAdmin/form?userCode='+row.userCode+'&op=edit" class="btnList" title="${text("编辑用户")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/corpAdmin/disable?userCode='+row.userCode+'" class="btnList" title="${text("停用用户")}" data-confirm="${text("确认要停用该用户吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -93,14 +93,14 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/sys/corpAdmin/enable?userCode='+row.userCode+'" class="btnList" title="${text("启用用户")}" data-confirm="${text("确认要启用该用户吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/sys/corpAdmin/delete?userCode='+row.userCode+'" class="btnList" title="${text("删除用户")}" data-confirm="${text("确认要删除该用户吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-				<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %>
+				//<% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %>
 				actions.push('<a href="${ctx}/sys/corpAdmin/form?corpCode_='+row.corpCode_+'&corpName_='+row.corpName_+'&op=addAdmin" class="btnList" title="${text("新增管理员")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
-				<% } %>
+				//<% } %>
 				actions.push('<a href="javascript:" class="btnMore" title="${text("更多操作")}"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;');
 				actions.push('<div class="moreItems">');
 				actions.push('<a href="${ctx}/sys/corpAdmin/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户密码重置")}" data-confirm="${text("确认要将该用户密码重置到初始状态吗？")}"><i class="fa fa-reply-all"></i> ${text("重置密码")}</a>&nbsp;');
 				actions.push('</div>');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
index a334acae..de938da9 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
@@ -267,7 +267,7 @@ $("#empOfficeGrid").dataGrid({
 		
 	}
 });
-<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%>
+//<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%>
 // 加载角色列表
 var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
@@ -287,17 +287,17 @@ var roleGrid = $("#roleGrid").dataGrid({
 		return $('#inputForm .box-body').width()-20;
 	},
 	ajaxSuccess: function(){
-		<% for (role in roleList!){ %>
+		//<% for (role in roleList!){ %>
  		roleGrid.dataGrid('setSelectRow', '${role.roleCode}');
-		<% } %>
+		//<% } %>
 	}
 });
-<% } %>
+//<% } %>
 $("#inputForm").validate({
 	submitHandler: function(form){
-		<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
+		//<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
 		$("#userRoleString").val(roleGrid.dataGrid('getSelectRows').join(','));
-		<% } %>
+		//<% } %>
 		var empNo = $('#employee_empNo').val();
 		if (empNo == ''){
 			$('#employee_empNo').val($('#loginCode').val());
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
index 040b016e..6abeb706 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
@@ -167,8 +167,8 @@ for (var i=0; i<dataScopes.length; i++){
 	});
 }
 // 默认选择节点
-<% for(dataScope in userDataScopeList){ %> 
+//<% for(dataScope in userDataScopeList){ %>
 try{dataScopeTrees['${dataScope.ctrlType}'].checkNode(dataScopeTrees['${dataScope.ctrlType}']
 	.getNodeByParam("id","${dataScope.ctrlData}"), true, false);}catch(e){}
-<% } %>
+//<% } %>
 </script>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 0b4f2e4c..36821e03 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -139,33 +139,33 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:empUser:edit')){ %>
+			//<% if(hasPermi('sys:empUser:edit')){ %>
 				actions.push('<a href="${ctx}/sys/empUser/form?userCode='+row.userCode+'&op=edit" class="btnList" title="${text("编辑用户")}"><i class="fa fa-pencil"></i></a>&nbsp;');
-			<% } %>
-			<% if(hasPermi('sys:empUser:updateStatus')){ %>
+			//<% } %>
+			//<% if(hasPermi('sys:empUser:updateStatus')){ %>
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/empUser/disable?userCode='+row.userCode+'" class="btnList" title="${text("停用用户")}" data-confirm="${text("确认要停用该用户吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}else if (row.status == Global.STATUS_DISABLE || row.status == Global.STATUS_FREEZE || row.status == Global.STATUS_AUDIT){
 					actions.push('<a href="${ctx}/sys/empUser/enable?userCode='+row.userCode+'" class="btnList" title="${text("启用用户")}" data-confirm="${text("确认要启用该用户吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
-			<% } %>
-			<% if(hasPermi('sys:empUser:edit')){ %>
+			//<% } %>
+			//<% if(hasPermi('sys:empUser:edit')){ %>
 				actions.push('<a href="${ctx}/sys/empUser/delete?userCode='+row.userCode+'" class="btnList" title="${text("删除用户")}" data-confirm="${text("确认要删除该用户吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
-			<% if(hasPermi('sys:empUser:authRole,sys:empUser:authDataScope,sys:empUser:resetpwd', 'or')){ %>
+			//<% } %>
+			//<% if(hasPermi('sys:empUser:authRole,sys:empUser:authDataScope,sys:empUser:resetpwd', 'or')){ %>
 				actions.push('<a href="javascript:" class="btnMore" title="${text("更多操作")}"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;');
 				actions.push('<div class="moreItems">');
-				<% if(hasPermi('sys:empUser:authRole')){ %>
+				//<% if(hasPermi('sys:empUser:authRole')){ %>
 					actions.push('<a href="${ctx}/sys/empUser/form?userCode='+row.userCode+'&op=auth" class="btn btn-default btn-xs btnList" title="${text("用户分配角色")}"><i class="fa fa-check-square-o"></i> ${text("分配角色")}</a>&nbsp;');
-				<% } %>
-				<% if(hasPermi('sys:empUser:authDataScope')){ %>
+				//<% } %>
+				//<% if(hasPermi('sys:empUser:authDataScope')){ %>
 					actions.push('<a href="${ctx}/sys/empUser/formAuthDataScope?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户分配数据权限")}"><i class="fa fa-check-circle-o"></i> ${text("数据权限")}</a>&nbsp;');
-				<% } %>
-				<% if(hasPermi('sys:empUser:resetpwd')){ %>
+				//<% } %>
+				//<% if(hasPermi('sys:empUser:resetpwd')){ %>
 					actions.push('<a href="${ctx}/sys/empUser/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户密码重置")}" data-confirm="${text("确认要将该用户密码重置到初始状态吗？")}"><i class="fa fa-reply-all"></i> ${text("重置密码")}</a>&nbsp;');
-				<% } %>
+				//<% } %>
 				actions.push('</div>');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
index 00adebd9..7aa92727 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
@@ -130,9 +130,9 @@ var setting = {view:{selectedMulti:false},data:{simpleData:{enable:true}},
 	if (queryType == 'userType'){
 		$('#queryTypeName').text('${text("按用户类型")}');
 		tree = $.fn.zTree.init($("#tree"), setting, [
-			<% for(dict in @DictUtils.getDictList('sys_user_type')){ %>
+			//<% for(dict in @DictUtils.getDictList('sys_user_type')){ %>
 			{id: '${dict.dictValue}', name: '${text(dict.dictLabel + "类型")}'},
-			<% } %>
+			//<% } %>
 			{id: 'none', name: '${text("系统管理员")}'}
 		]);
 		tree.expandAll(true);
diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
index 67e979e9..420cca73 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
@@ -167,8 +167,8 @@ for (var i=0; i<dataScopes.length; i++){
 	});
 }
 // 默认选择节点
-<% for(dataScope in userDataScopeList){ %> 
+//<% for(dataScope in userDataScopeList){ %>
 try{dataScopeTrees['${dataScope.ctrlType}'].checkNode(dataScopeTrees['${dataScope.ctrlType}']
 	.getNodeByParam("id","${dataScope.ctrlData}"), true, false);}catch(e){}
-<% } %>
+//<% } %>
 </script>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html
index 83a8b958..132fb079 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html
@@ -20,20 +20,20 @@
 					对应的管理权限功能，如用户管理、机构管理、公司管理，将启用为拥有权限的数据过滤，因此二级管理设置的管理权限将没有意义。
 					若启用该功能，请打开 application.yml 设置为管理的权限：user.adminCtrlPermi=2</p>
 			</div>
-			<% } %>
-			<#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline "
+			<% } %>
+			<#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline "
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('账号')}：</label>
-					<div class="control-inline">
-						<#form:input path="loginCode" maxlength="100" class="form-control width-90"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('昵称')}：</label>
-					<div class="control-inline">
-						<#form:input path="userName" maxlength="100" class="form-control width-90"/>
-					</div>
+				<div class="form-group">
+					<label class="control-label">${text('账号')}：</label>
+					<div class="control-inline">
+						<#form:input path="loginCode" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('昵称')}：</label>
+					<div class="control-inline">
+						<#form:input path="userName" maxlength="100" class="form-control width-90"/>
+					</div>
 				</div>
 				<div class="form-group">
 					<label class="control-label">${text('邮箱')}：</label>
@@ -52,16 +52,16 @@
 					<div class="control-inline">
 						<#form:input path="phone" maxlength="100" class="form-control width-90"/>
 					</div>
-				</div>
+				</div>
 				<div class="form-group">
 					<label class="control-label">${text('状态')}：</label>
 					<div class="control-inline width-90">
 						<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
 					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>
@@ -91,10 +91,10 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('sys:secAdmin:edit')){ %>
+			//<% if(hasPermi('sys:secAdmin:edit')){ %>
 				actions.push('<a href="${ctx}/sys/secAdmin/form?userCode='+row.userCode+'" class="btnList" title="${text("管理数据权限")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/sys/secAdmin/delete?userCode='+row.userCode+'" class="btnList" title="${text("取消二级管理员身份")}" data-confirm="${text("确认要取消该用户的二级管理员身份吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
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 3fc9f8b5..47c29a22 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
@@ -71,11 +71,11 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true);
 		}},
-		<% if(isBlank(user.userType)){ %>
+		//<% if(isBlank(user.userType)){ %>
 		{header:'${text("类型")}', name:'userType', index:'a.user_type', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_user_type')}, val, '无', true);
 		}},
-		<% } %>
+		//<% } %>
 		{header:'行数据', name:'rowData', hidden:true, formatter: function(val, obj, row, act){
 			return JSON.stringify(row);
 		}}
diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
index 3be4e152..aac75305 100644
--- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -14,105 +14,105 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">单行文本：</label>
-					<div class="control-inline">
-						<#form:input path="testInput" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">多行文本：</label>
-					<div class="control-inline">
-						<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">下拉框：</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">下拉多选：</label>
-					<div class="control-inline width-120">
-						<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">单选框：</label>
-					<div class="control-inline">
-						<#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">复选框：</label>
-					<div class="control-inline">
-						<#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">日期选择：</label>
-					<div class="control-inline">
-						<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
-							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">日期时间：</label>
-					<div class="control-inline">
-						<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>
-						&nbsp;-&nbsp;
-						<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
-							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">用户选择：</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testUser" title="用户选择"
-							path="testUser.userCode" labelPath="testUser.userName" 
-							url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">机构选择：</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testOffice" title="机构选择"
-							path="testOffice.officeCode" labelPath="testOffice.officeName" 
-							url="${ctx}/sys/office/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">区域选择：</label>
-					<div class="control-inline width-120" >
-						<#form:treeselect id="testAreaCode" title="区域选择"
-							path="testAreaCode" labelPath="testAreaName" 
-							url="${ctx}/sys/area/treeData" allowClear="true"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">状态：</label>
-					<div class="control-inline width-120">
-						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">备注信息：</label>
-					<div class="control-inline">
-						<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">查询</button>
-					<button type="reset" class="btn btn-default btn-sm">重置</button>
-				</div>
-			</#form:form>
+			<#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide"
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">单行文本：</label>
+					<div class="control-inline">
+						<#form:input path="testInput" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">多行文本：</label>
+					<div class="control-inline">
+						<#form:input path="testTextarea" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">下拉框：</label>
+					<div class="control-inline width-120">
+						<#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">下拉多选：</label>
+					<div class="control-inline width-120">
+						<#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">单选框：</label>
+					<div class="control-inline">
+						<#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">复选框：</label>
+					<div class="control-inline">
+						<#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">日期选择：</label>
+					<div class="control-inline">
+						<#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
+							dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/>
+						&nbsp;-&nbsp;
+						<#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date"
+							dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">日期时间：</label>
+					<div class="control-inline">
+						<#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/>
+						&nbsp;-&nbsp;
+						<#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">用户选择：</label>
+					<div class="control-inline width-120" >
+						<#form:treeselect id="testUser" title="用户选择"
+							path="testUser.userCode" labelPath="testUser.userName" 
+							url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">机构选择：</label>
+					<div class="control-inline width-120" >
+						<#form:treeselect id="testOffice" title="机构选择"
+							path="testOffice.officeCode" labelPath="testOffice.officeName" 
+							url="${ctx}/sys/office/treeData" allowClear="true"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">区域选择：</label>
+					<div class="control-inline width-120" >
+						<#form:treeselect id="testAreaCode" title="区域选择"
+							path="testAreaCode" labelPath="testAreaName" 
+							url="${ctx}/sys/area/treeData" allowClear="true"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">状态：</label>
+					<div class="control-inline width-120">
+						<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">备注信息：</label>
+					<div class="control-inline">
+						<#form:input path="remarks" maxlength="500" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">查询</button>
+					<button type="reset" class="btn btn-default btn-sm">重置</button>
+				</div>
+			</#form:form>
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
 		</div>
@@ -162,7 +162,7 @@ $('#dataGrid').dataGrid({
 		{header:'备注信息', name:'remarks', index:'a.remarks', width:150, align:"left"},
 		{header:'操作', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('test:testData:edit')){ %>
+			//<% if(hasPermi('test:testData:edit')){ %>
 				actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="编辑数据"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/test/testData/disable?id='+row.id+'" class="btnList" title="停用数据" data-confirm="确认要停用该数据吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -170,7 +170,7 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/test/testData/enable?id='+row.id+'" class="btnList" title="启用数据" data-confirm="确认要启用该数据吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/test/testData/delete?id='+row.id+'" class="btnList" title="删除数据" data-confirm="确认要删除该数据吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html
index 33ab0380..3759f74c 100644
--- a/web/src/main/resources/views/modules/test/testDataList.html
+++ b/web/src/main/resources/views/modules/test/testDataList.html
@@ -153,7 +153,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
 		{header:'${text("操作")}', name:'actions', width:100, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('test:testData:edit')){ %>
+			//<% if(hasPermi('test:testData:edit')){ %>
 				actions.push('<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" title="${text("编辑数据")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/test/testData/disable?id='+row.id+'" class="btnList" title="${text("停用数据")}" data-confirm="${text("确认要停用该数据吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -161,7 +161,7 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/test/testData/enable?id='+row.id+'" class="btnList" title="${text("启用数据")}" data-confirm="${text("确认要启用该数据吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="${ctx}/test/testData/delete?id='+row.id+'" class="btnList" title="${text("删除数据")}" data-confirm="${text("确认要删除该数据吗？")}"><i class="fa fa-trash-o"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],
diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html
index 6b7d0ff6..a2a7a6f1 100644
--- a/web/src/main/resources/views/modules/test/testTreeList.html
+++ b/web/src/main/resources/views/modules/test/testTreeList.html
@@ -64,7 +64,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"},
 		{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
 			var actions = [];
-			<% if(hasPermi('test:testTree:edit')){ %>
+			//<% if(hasPermi('test:testTree:edit')){ %>
 				actions.push('<a href="${ctx}/test/testTree/form?treeCode='+row.treeCode+'" class="btnList" title="${text("编辑数据")}"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/test/testTree/disable?treeCode='+row.treeCode+'" class="btnList" title="${text("停用数据")}" data-confirm="${text("确认要停用该数据吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
@@ -73,7 +73,7 @@ $('#dataGrid').dataGrid({
 				}
 				actions.push('<a href="${ctx}/test/testTree/delete?treeCode='+row.treeCode+'" class="btnList" title="${text("删除数据")}" data-confirm="${text("确认要删除该数据及所有子数据吗？")}" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="${ctx}/test/testTree/form?parentCode='+row.id+'" class="btnList" title="${text("新增下级数据")}"><i class="fa fa-plus-square"></i></a>&nbsp;');
-			<% } %>
+			//<% } %>
 			return actions.join('');
 		}}
 	],