From fcc34b26b5d0eaeb1e609a625e805b5c18d70999 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 11 Sep 2018 15:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=80=A7=E8=B4=A8=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=8A=A0=E5=85=A5=E9=BB=98=E8=AE=A4=E5=80=BC0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/form/basicInfo.jsp | 6 +++---
 src/main/webapp/WEB-INF/tags/sys/treeselect.tag    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 0bdef9c2a..be2aaed44 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -36,7 +36,7 @@
 				    	<c:set var="classifyValue" value="${classifyValue},${fns:getServiceDictInfoById(_classify).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0"
+           		<sys:treeselect id="classify" name="classify" value="${empty _cfg.classify?0:_cfg.classify}" labelName="classifyName" extId="0"
 				labelValue="${classifyValue}"
 					title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
@@ -86,7 +86,7 @@
 				    	<c:set var="attributeValue" value="${attributeValue},${fns:getServiceDictInfoById(_attribute).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="attribute" name="attribute" value="${_cfg.attribute}" labelName="attributeName" extId="0"
+           		<sys:treeselect id="attribute" name="attribute" value="${empty _cfg.attribute?0:_cfg.attribute}" labelName="attributeName" extId="0"
 				labelValue="${attributeValue}"
 					title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
@@ -131,7 +131,7 @@
 				    	<c:set var="lableValue" value="${lableValue},${fns:getServiceDictInfoById(_lable).itemValue}"></c:set>
 				    </c:if>           			
 		        </c:forEach>
-           		<sys:treeselect id="lable" name="lable" value="${_cfg.lable}" labelName="lableName" extId="0"
+           		<sys:treeselect id="lable" name="lable" value="${empty _cfg.lable?0:_cfg.lable}" labelName="lableName" extId="0"
 				labelValue="${lableValue}"
 					title="label" url="/basics/serviceDictInfo/treeData?itType=3&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
 					checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index db5f984de..0bc215e5d 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -30,7 +30,7 @@
 <%@ attribute name="enableSearch" type="java.lang.Boolean" required="false" description="是否开启节点搜索功能"%>
 <div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
-	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${empty value?labelValue:value}"
+	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${(empty value or value eq extId)?labelValue:value}"
 		class="${cssClass}" style="${cssStyle} background-color:transparent"/>
 		
 		<div class="input-group-btn">