From 19d346e2debf055cb432160893386135c3de1fd2 Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Wed, 21 Mar 2018 18:19:03 +0800
Subject: [PATCH] =?UTF-8?q?0000020:=20=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?-=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20=E9=80=89=E4=B8=8A=E7=BA=A7=E6=97=B6=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=8F=B6=E5=AD=90=E8=8A=82=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AD=98=E5=9C=A8=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=8D=E5=BE=97=E6=94=B9=E4=B8=BA=E5=8F=B6=E5=AD=90=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=200000022:=20=E5=9F=BA=E6=9C=AC=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE-=E7=89=B9=E5=BE=81=E4=BD=9C=E7=94=A8=E5=9F=9F=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E5=8F=B6?=
 =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AF=A5?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=89=80=E6=9C=89=E9=85=8D=E7=BD=AE=E5=9D=87?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=B9=E8=8A=82=E7=82=B9=EF=BC=8C=E5=8F=B6=E5=AD=90?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basics/SysDictInfoController.java         |  6 +++++
 .../SpecificServiceCfgController.java         |  2 +-
 .../WEB-INF/views/basics/sysDictForm.jsp      | 20 +++++++++-------
 .../WEB-INF/views/basics/sysDictList.jsp      |  4 ++++
 .../views/specific/specificServiceCfgForm.jsp | 24 +++++++------------
 5 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index a5132ccfd..1a38e57a2 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -76,6 +76,9 @@ public class SysDictInfoController extends BaseController {
 		for(int i=0;i<strArr.length;i++){
 			intArr[i] = Integer.valueOf(strArr[i]); 
 		}
+		if(intArr.length==1){
+			model.addAttribute("specType", intArr[0]);
+		}
 		String searchType = null;
 		String searchContent = null;
 		if(!StringUtils.isBlank(sysDictInfo.getItemCode())){
@@ -164,6 +167,9 @@ public class SysDictInfoController extends BaseController {
 		for(int i=0;i<strArr.length;i++){
 			intArr[i] = Integer.valueOf(strArr[i]); 
 		}
+		if(intArr.length==1){
+			model.addAttribute("specType", intArr[0]);
+		}
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("sysDictInfo", sysDictInfo);
 		model.addAttribute("itType", itType);
diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
index d660e8c36..c59599481 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -206,7 +206,7 @@ public class SpecificServiceCfgController extends BaseController {
 		for (int i=0; i<list.size(); i++){
 			SpecificServiceCfg specificServiceCfg = list.get(i);
 			if(StringUtils.isBlank(extId)||(extId!=null&&!extId.equals(specificServiceCfg.getSpecServiceId().toString()))){
-				if(specificServiceCfg.getIsValid().equals(0)&&specificServiceCfg.getIsLeaf().equals(1)){
+				if(specificServiceCfg.getIsValid().equals(0)||specificServiceCfg.getIsLeaf().equals(1)){
 					continue;
 				}
 				Map<String, Object> map = Maps.newHashMap();
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
index 1ebeb0a8e..ebfd50c06 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
@@ -235,15 +235,19 @@
 									<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
 							</div>
-							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
-								<div class="col-md-4">
-									<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
-									<form:select path="isLeaf"  class="form-control">
-					                  <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
-				                    </form:select>
+							<c:if test="${specType != null and specType==3 }">
+							    <form:hidden path="isLeaf" value="0"/>
+							</c:if>
+							<c:if test="${specType != null and specType!=3 }">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
+									<div class="col-md-4">
+											<form:select path="isLeaf"  class="form-control">
+							                  <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
+						                    </form:select>
+									</div>
 								</div>
-							</div>
+							</c:if>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 8c00f157c..add84e0b9 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -258,7 +258,9 @@
 								   <th><spring:message code="config_content"/></th>
 								   <th><spring:message code="desc"/></th>
 								   <th><spring:message code="item_type"/></th>
+								   <c:if test="${specType != null and specType!=3 }">
 								   <th><spring:message code="is_leaf"/></th>
+								   </c:if>
 								   <th><spring:message code="creator"/></th>
 								   <th class="sort-column create_time"><spring:message code="create_time"/>
 								   </th><th><spring:message code="editor"/></th>
@@ -275,7 +277,9 @@
 												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
+												<c:if test="${specType != null and specType!=3 }">
 												<td>${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}</td>
+												</c:if>
 												<td><c:if test="${sysDictInfo.sysDictCreator != null}">
 												    ${fns:getUserById(sysDictInfo.sysDictCreator.id).name}
 												    </c:if></td>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index f29342436..c434d1a18 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -43,45 +43,39 @@
 			$("#name").focus();
 			$("#inputForm").validate({
 				rules:{
-				 	'specServiceId':{
+				 	specServiceId:{
 						required:true,
 						digits:true,
 						maxValue: true,
 						remote:'${ctx}/specific/specificServiceCfg/isIdRepeat?oldId=${specificServiceCfg.specServiceId}'
 					},
-					'specServiceName':{
+					specServiceName:{
 						required:true
 					},
-					'groupId':{
+					groupId:{
 						digits:true,
 						maxValue:true
 						},
-					 'specServiceDesc':{
-						 required:true
-					},
-					'isLeaf':{
+					isLeaf:{
 						leafHasTree:true,
 						leafChange:true 
 					}
 				},
 				messages: {
-					 'specServiceId':{
+					 specServiceId:{
 						required:'请填写协议ID',
 						digits:"请填写整数数字",
 						maxValue: "请填写正确的协议ID(0~210000000)",
 						remote:'该协议ID已存在'
 					},
-					'specServiceName':{
+					specServiceName:{
 						required:'请填写协议名称'
 					},
-					'groupId':{
+					groupId:{
 						digits:'请填写整数数值',
 						maxValue:'请填写正确的分组Id(0~210000000)'
 						},
-					 'specServiceDesc':{
-						required:'请填写协议描述'
-					},
-					'isLeaf':{
+					isLeaf:{
 						leafHasTree:'该配置上级为根节点，不得设为叶子节点',
 						leafChange:'该配置包含下级配置，不得改为叶子节点'
 					}
@@ -181,7 +175,7 @@
 								</div>
 							</div> 
 							 <div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>协议描述:</label>
+								<label class="col-md-3 control-label">协议描述:</label>
 								<div class="col-md-4">
 									<form:textarea path="specServiceDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>