diff --git a/jsite-common/src/main/resources/static/modules/sys/login.css b/jsite-common/src/main/resources/static/modules/sys/login.css
index 6ff90c067d8c49cbf230be191efe601e29ebc2d3..4a0e2a3c34075950dfffffb64e4e9397de80fb39 100644
--- a/jsite-common/src/main/resources/static/modules/sys/login.css
+++ b/jsite-common/src/main/resources/static/modules/sys/login.css
@@ -71,7 +71,7 @@ lowin-input
 }
 
 .lowin .lowin-box::after {
-	content: ' ';
+	/* content: ' '; */
 	-webkit-box-shadow: 0 0 25px rgba(0, 0, 0, .1);
 	        box-shadow: 0 0 25px rgba(0, 0, 0, .1);
 	-webkit-transform: translate(0, -92.6%) scale(.88);
diff --git a/jsite-core/src/main/resources/template/modules/gen/curd/viewForm.xml b/jsite-core/src/main/resources/template/modules/gen/curd/viewForm.xml
index ad64d3d846b9efc306b7a10bda94503dae78a5c2..cea87983ab7c4280f4c928e55aa8429619da5f19 100644
--- a/jsite-core/src/main/resources/template/modules/gen/curd/viewForm.xml
+++ b/jsite-core/src/main/resources/template/modules/gen/curd/viewForm.xml
@@ -40,6 +40,8 @@
 								<${'#'}form:textarea path="${c.javaFieldId}" rows="4" <#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="form-control input-xxlarge "/>
 							<#elseif c.showType == "select">
 								<${'#'}form:select path="${c.javaFieldId}" name="label" data="getDictList:${c.dictType}" class="form-control <#if c.isNull != "1">required</#if> " />
+							<#elseif c.showType == "radiobox">
+								<${'#'}form:radio path="${c.javaFieldId}" dictType="${c.dictType}" class="form-control <#if c.isNull != "1">required</#if>"/>
 							<#elseif c.showType == "checkbox">
 								<${'#'}form:checkboxes path="${c.javaFieldId}" data="" items="" itemLabel="name" itemValue="id" class="form-control <#if c.isNull != "1">required</#if>"/>
 							<#elseif c.showType == "dateselect">
diff --git a/jsite-core/src/main/resources/template/modules/gen/curd/viewFormMany.xml b/jsite-core/src/main/resources/template/modules/gen/curd/viewFormMany.xml
index c86d3cb8fbce6ee47ca59b578222737f704be45b..22ebfe6f23ace031adf26cb616a05a9701faee72 100644
--- a/jsite-core/src/main/resources/template/modules/gen/curd/viewFormMany.xml
+++ b/jsite-core/src/main/resources/template/modules/gen/curd/viewFormMany.xml
@@ -41,6 +41,8 @@
 								<${'#'}form:select path="${c.javaFieldId}" name="label" data="getDictList:${c.dictType}" class="form-control <#if c.isNull != "1">required</#if> " />
 							<#elseif c.showType == "checkbox">
 								<${'#'}form:checkboxes path="${c.javaFieldId}" data="" items="" itemLabel="name" itemValue="id" class="form-control <#if c.isNull != "1">required</#if>"/>
+							<#elseif c.showType == "checkbox">
+								<${'#'}form:checkboxes path="${c.javaFieldId}" data="" items="" itemLabel="name" itemValue="id" class="form-control <#if c.isNull != "1">required</#if>"/>
 							<#elseif c.showType == "dateselect">
 								<input id="${c.javaFieldId}" type="text" name="${c.javaFieldId}" maxlength="20" readonly="readonly" class="form-control <#if c.isNull != "1">required</#if> "
 										value="${"$"}{${className}.${c.javaFieldId}}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
diff --git a/jsite-core/src/main/resources/template/modules/gen/curd/viewList.xml b/jsite-core/src/main/resources/template/modules/gen/curd/viewList.xml
index cbfdb226a271d35dd33f5601f263b52dbd453665..5ab20f712d36697395fcc0dfa6b42ca6aa861ce4 100644
--- a/jsite-core/src/main/resources/template/modules/gen/curd/viewList.xml
+++ b/jsite-core/src/main/resources/template/modules/gen/curd/viewList.xml
@@ -4,7 +4,7 @@
 	<filePath>src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
-<% layout('/layout/default.html', {title: '${functionNameSimple}', libs: ['dataGrid']}){ %>
+<% layout('/layout/default.html', {title: '${functionNameSimple}', libs: ['dataGrid', 'icheck']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header">
@@ -29,6 +29,8 @@
 						<input name="${c.javaFieldId}" <#if c.dataLength != "0"> maxlength="${c.dataLength}"</#if> class="form-control"/>
 					<#elseif c.showType == "select">
 						<${'#'}form:select path="${c.javaFieldId}" name="label" data="getDictList:${c.dictType}" class="form-control " />
+					<#elseif c.showType == "radiobox">
+						<${'#'}form:radio path="${c.javaFieldId}" dictType="${c.dictType}" class="form-control "/>
 					<#elseif c.showType == "dateselect" && c.queryType == "between">
 						<input id="begin${c.simpleJavaField?cap_first}" name="begin${c.simpleJavaField?cap_first}" maxlength="20" readonly="readonly" class="form-control "
 							value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" /> -
@@ -61,7 +63,13 @@ $('#dataGrid').dataGrid({
 	columnModel: [
 		<#list table.columnList as c>
 		<#if c.isList?? && c.isList == "1">
-		{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:90, align:"center"},
+			<#if c.showType == "radiobox">
+			{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:50, align:"center", formatter: function(val, obj, row, act){
+                    return js.transDictLabel(${"$"}{@DictUtils.getDictListJson('${c.dictType}')}, val, '');
+             }},
+			<#else>
+			{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:90, align:"center"},
+			</#if>
 		</#if>
 		</#list>
 		{header:'操作', name:'actions', width:100, sortable:false, title:false, align:"center",formatter: function(val, obj, row, act){
diff --git a/jsite-core/src/main/resources/template/modules/gen/treetable/viewList.xml b/jsite-core/src/main/resources/template/modules/gen/treetable/viewList.xml
index d9122b86c401b642c37adcadefe0db6178ec4ca7..3acbc493b3b9a36957c0103f5cee90bc54e95cba 100644
--- a/jsite-core/src/main/resources/template/modules/gen/treetable/viewList.xml
+++ b/jsite-core/src/main/resources/template/modules/gen/treetable/viewList.xml
@@ -37,7 +37,13 @@ $('#dataGrid').dataGrid({
 	columnModel: [
 		<#list table.columnList as c>
 		<#if c.isList?? && c.isList == "1">
-		{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:90, align:"center"},
+			<#if c.showType == "radiobox">
+			{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:50, align:"center", formatter: function(val, obj, row, act){
+                    return js.transDictLabel(${"$"}{@DictUtils.getDictListJson('${c.dictType}')}, val, '');
+             }},
+			<#else>
+			{header:'${c.comments}', name:'${c.javaFieldId}', index:'a.${c.name}', width:90, align:"center"},
+			</#if>
 		</#if>
 		</#list>
 		{header:'操作', name:'actions', width:100, sortable:false, title:false, align:"center",formatter: function(val, obj, row, act){
diff --git a/jsite-framework/src/main/java/com/jsite/modules/sys/service/SystemService.java b/jsite-framework/src/main/java/com/jsite/modules/sys/service/SystemService.java
index 0710f6415cd7abf787f4696c326712e98c6f692b..335e1ecf08a48a57ef3108fb06c03039f910ed19 100644
--- a/jsite-framework/src/main/java/com/jsite/modules/sys/service/SystemService.java
+++ b/jsite-framework/src/main/java/com/jsite/modules/sys/service/SystemService.java
@@ -334,19 +334,28 @@ public class SystemService extends BaseService {
 		String oldParentId = "";
 		
 		if(parent == null) {// 新增的根节点
-			menu.setTreeLeaf("1");
+			menu.setTreeLeaf("0");
 			menu.setTreeLevel(0);
+			if(menu.getIsNewRecord()) {//新增的下级菜单
+				menu.setTreeLeaf("1");
+			} 
 		} else {
 			if(menu.getIsNewRecord()) {//新增的下级菜单
 				menu.setTreeLeaf("1");
 				menu.setTreeLevel(parent.getTreeLevel()+1);
-				if(parent.getIsTreeLeaf()) {
-					parent.setTreeLeaf("0");
-					menuDao.update(parent);
-				}
 			} else {
 				oldParentId = getMenu(menu.getId()).getParent().getId();// 数据库中当前的menu的ParentId，还未更新
 			}
+			//更新选择的父节点
+			parent.setTreeLeaf("0");
+			Menu topparent = this.getMenu(parent.getParent().getId());
+			if (topparent != null) {
+				parent.setTreeLevel(topparent.getTreeLevel() + 1);
+			} else {
+				menu.setTreeLevel(0);
+			}
+			menuDao.update(parent);
+			menu.setTreeLevel(parent.getTreeLevel() + 1);
 		}
 		
 		// 获取修改前的parentIds，用于更新子节点的parentIds
@@ -368,12 +377,13 @@ public class SystemService extends BaseService {
 			if(!oldParentId.equals(menu.getParent().getId())) {// 不相同则menu修改了父节点
 				Menu oldParent = getMenu(oldParentId);
 				// 判断原来的父节点下还有没有子菜单
-				List<Menu> list = menuDao.findSubMenuListByPid(oldParent);
-				if(list.size() <= 0) {
-					
-					if(!oldParent.getIsTreeLeaf()) {
-						oldParent.setTreeLeaf("1");
-						menuDao.update(oldParent);
+				if(oldParent!=null) {
+					List<Menu> list = menuDao.findSubMenuListByPid(oldParent);
+					if(list.size() <= 0) {
+						if(!oldParent.getIsTreeLeaf()) {
+							oldParent.setTreeLeaf("1");
+							menuDao.update(oldParent);
+						}
 					}
 				}
 			}