diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
index de57edfb1..351396a5e 100644
--- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
@@ -1,5 +1,6 @@
 package com.nis.web.controller.basics;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -192,11 +193,13 @@ public class ServiceDictInfoController extends BaseController {
 	 * @param extId
 	 * @param isShowHidden
 	 * @param response
+	 * @param isShowLeaf是否查询叶子节点
 	 * @return
 	 */
 	@ResponseBody
 	@RequestMapping(value = "treeData")
-	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
+	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) boolean isShowLeaf,
+			@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) {
 		List<Map<String, Object>> mapList = Lists.newArrayList();
 		Map<String, Object> map2 = Maps.newHashMap();
 		map2.put("id", 0);
@@ -204,8 +207,22 @@ public class ServiceDictInfoController extends BaseController {
 		map2.put("name","root_node");
 		//map2.put("placeholder","0");
 		mapList.add(map2);
-		//找出该类型所有的非叶子配置
-		List<ServiceDictInfo> list = serviceDictInfoService.findAllNoLeafDictList(itType);
+		List<ServiceDictInfo> list = new ArrayList();
+		
+		if(isShowLeaf){
+			if(itType.equals("1")){
+				list = serviceDictInfoService.findFlDict();
+			}else if(itType.equals("2")){
+				list = serviceDictInfoService.findXzDict();
+			}else{
+				list = serviceDictInfoService.findLableDict();
+			}
+			
+		}else{
+			//找出该类型所有的非叶子配置
+			list = serviceDictInfoService.findAllNoLeafDictList(itType);
+		}
+		
 		for (int i=0; i<list.size(); i++){
 			ServiceDictInfo serviceDictInfo = list.get(i);
 			if (StringUtils.isBlank(extId) || (extId !=null && !extId.equals(serviceDictInfo.getServiceDictId().toString()))) {
diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
index fffea9bd1..1a2f9cc20 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
@@ -73,8 +73,8 @@ public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
 	
 	
 	
-	List<ServiceDictInfo> findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid);
-	List<ServiceDictInfo> findAllItemDict(@Param("itemType")int itemType);
+	List<ServiceDictInfo> findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid,@Param("isLeaf")Integer isLeaf);
+	List<ServiceDictInfo> findAllItemDictByItemType(@Param("itemType")int itemType,@Param("isLeaf")Integer isLeaf);
 	
 
 
diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
index 2e29ff8b1..356c031e8 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
@@ -289,12 +289,18 @@
   <select id="findItemDict" resultMap="dictResultSimpleMap">
    select 
    <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
+   from service_dict_info s where   s.item_type=#{itemType} and s.is_valid=#{isValid}
+   <if test="isLeaf != null" >
+      and s.is_leaf = #{isLeaf,jdbcType=INTEGER},
+   </if>
    </select>
-  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
+  <select id="findAllItemDictByItemType" resultMap="dictResultSimpleMap">
    select 
    <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
+   from service_dict_info s where   s.item_type=#{itemType}
+    <if test="isLeaf != null" >
+     and s.is_leaf = #{isLeaf,jdbcType=INTEGER},
+   </if>
    </select>
    
    	<sql id="menuJoins">
diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
index 646739048..f42ed13fb 100644
--- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
@@ -224,7 +224,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findFlDict() {
-		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_FL,Constants.VALID_YES);
+		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_FL,Constants.VALID_YES,null);
 	}
 	/**
 	 * 
@@ -236,7 +236,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findAllFlDict() {
-		return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_FL);
+		return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_FL,null);
 	}
 	/**
 	 * 
@@ -248,7 +248,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findXzDict() {
-		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_XZ,Constants.VALID_YES);
+		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_XZ,Constants.VALID_YES,null);
 	}
 	/**
 	 * 
@@ -260,7 +260,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findAllXzDict() {
-		return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_XZ);
+		return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_XZ,null);
 	}
 	/**
 	 * 
@@ -272,7 +272,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findLableDict() {
-		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_LABEL,Constants.VALID_YES);
+		return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_LABEL,Constants.VALID_YES,null);
 	}
 	
 	/**
@@ -285,7 +285,7 @@ public class ServiceDictInfoService extends BaseService{
 	 * @since  1.0.0
 	 */
 	public List<ServiceDictInfo> findAllLableDict() {
-		return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_LABEL);
+		return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_LABEL,null);
 	}
 
 
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 08e4040e5..85097cf7c 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -39,7 +39,7 @@
 		        </c:forEach>
            		<sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0"
 				labelValue="${classifyValue}"
-					title="type" url="/basics/serviceDictInfo/treeData?itType=1" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
+					title="type" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="required form-control" checkedPS="" unCheckedPS=""/>
            	 <%-- <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                	
@@ -89,7 +89,7 @@
 		        </c:forEach>
            		<sys:treeselect id="attribute" name="attribute" value="${_cfg.attribute}" labelName="attributeName" extId="0"
 				labelValue="${attributeValue}"
-					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
+					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="required form-control" checkedPS="" unCheckedPS=""/>
                <%--  <select name="attribute" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${xzs}" var="xz">
@@ -134,7 +134,7 @@
 		        </c:forEach>
            		<sys:treeselect id="lable" name="lable" value="${_cfg.lable}" labelName="lableName" extId="0"
 				labelValue="${lableValue}"
-					title="label" url="/basics/serviceDictInfo/treeData?itType=3" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
+					title="label" url="/basics/serviceDictInfo/treeData?itType=3&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="required form-control" checkedPS="" unCheckedPS=""/>
                 <%-- <select name="lable" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${lables}" var="lable">
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
index 3c41725f8..60feacc15 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
@@ -185,7 +185,7 @@ label.errorShow {
 								<div class="col-md-4">
                                     <c:set var="fatherName"><spring:message code="root_node"/></c:set>
 					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue"  labelValue="${serviceDictInfo.parent.serviceDictId eq '0'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
-										title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>	
+										title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>	
  								<label  class="errorShow" style="display: none;"><spring:message code="isLevelNoSure"/></label>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
index 04c64cb67..0dba33a3c 100644
--- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
@@ -49,7 +49,7 @@
 			}
 		}
 		$(document).ready(function(){
-			$.get("${ctx}${url}${fn:indexOf(url,'?')==-1?'?':'&'}&extId=${extId}&isAll=${isAll}&module=${module}&t="
+			$.get("${ctx}${url}${fn:indexOf(url,'?')==-1?'?':'&'}&extId=${extId}&selectIds: $('#${id}Id').val()&isAll=${isAll}&module=${module}&t="
 					+ new Date().getTime(), function(zNodes){
 				// 初始化树结构
 				//处理根节点国际化
@@ -85,7 +85,7 @@
 			for(var i=0; i<ids.length; i++) {
 				var node = tree.getNodeByParam("id", (type==3?"u_":"")+ids[i]);
 				//如果节点id与排除id相同，不被选中
-				if(node.id!=${extId}){
+				if(node.id!="${extId}"){
 					if("${checked}" == "true"){
 						try{tree.checkNode(node, true, true);}catch(e){}
 						tree.selectNode(node, false);