From 95892b46d54c022a86031e30180fcbc5a009f42d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 14 Sep 2018 10:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4IS=5FSHOW=5FBUSINESS=5FTYPE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=BC=80=E5=85=B3=E5=8F=AA=E5=AF=B9=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E4=BB=A5=E5=8F=8A=E5=BA=94=E7=94=A8=E4=B8=AD=E7=94=A8?=
 =?UTF-8?q?=E5=88=B0=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specific/SpecificServiceCfgController.java     | 14 +-------------
 .../WEB-INF/views/cfg/app/appPolicyCfgForm.jsp     | 10 +++++++++-
 .../WEB-INF/views/cfg/app/appPolicyCfgList.jsp     | 10 +++++++++-
 .../WEB-INF/views/cfg/basicprotocol/form.jsp       | 13 +++++++++----
 .../WEB-INF/views/cfg/basicprotocol/list.jsp       | 12 ++++++++++--
 .../views/cfg/encryptedtunnelbehav/form.jsp        | 13 +++++++++----
 .../views/cfg/encryptedtunnelbehav/list.jsp        | 13 +++++++++----
 7 files changed, 56 insertions(+), 29 deletions(-)

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 c3b52e848..2f7c9e44d 100644
--- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -214,19 +214,7 @@ public class SpecificServiceCfgController extends BaseController {
 		map2.put("name","root_node");
 		//map2.put("placeholder","0");
 		mapList.add(map2);
-		List<SysDataDictionaryItem> isShowList=DictUtils.getDictList("IS_SHOW_BUSINESS_TYPE");
-		boolean isShowBusinessType=false;
-		if(isShowList!=null&&isShowList.size()>0) {
-			for(SysDataDictionaryItem item:isShowList) {
-				if(item.getStatus()==1) {//可用
-					if("1".equals(item.getItemCode())) {
-						isShowBusinessType=true;
-						break;
-					}
-				}
-			}
-		}
-		if((specific==null||!specific)&&isShowBusinessType) {
+		if(specific==null||!specific) {
 			Properties props=this.getMsgProp();
 			List<SysDataDictionaryItem>  businessTypeList=Lists.newArrayList();
 			if(cfgType==1) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 0e0033f86..b293254c5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -229,13 +229,21 @@ var delContent = function(contentClassName, addBtnClassName) {
 									 <div class="row">
 		                              		<div class="col-md-6">
 										        <div class="form-group">
+										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+															<c:if test="${showBusinessType.itemCode==1 }">
+															<c:set var="isShowBusinessType" value="true"/>
+															</c:if>
+															<c:if test="${showBusinessType.itemCode!=1 }">
+															<c:set var="isShowBusinessType" value="false"/>
+															</c:if>
+													</c:forEach>
 										        	 <c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId="0"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId="0"
 														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 7cc3f5a03..f6149d224 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -132,11 +132,19 @@
 								</div>
 								
 								<div class="pull-left">
+									<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+											<c:if test="${showBusinessType.itemCode==1 }">
+											<c:set var="isShowBusinessType" value="true"/>
+											</c:if>
+											<c:if test="${showBusinessType.itemCode!=1 }">
+											<c:set var="isShowBusinessType" value="false"/>
+											</c:if>
+									</c:forEach>
 									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" enableSearch="true"
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 2919dee39..f647123b2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -131,9 +131,6 @@ var delContent = function(contentClassName, addBtnClassName) {
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'basic_protocol'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<h3 class="page-title">
 		<spring:message code="basic_protocol"></spring:message>
 	</h3>
@@ -181,13 +178,21 @@ var delContent = function(contentClassName, addBtnClassName) {
 									    
 									    <div class="col-md-6">
 										        <div class="form-group">
+										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+															<c:if test="${showBusinessType.itemCode==1 }">
+															<c:set var="isShowBusinessType" value="true"/>
+															</c:if>
+															<c:if test="${showBusinessType.itemCode!=1 }">
+															<c:set var="isShowBusinessType" value="false"/>
+															</c:if>
+													</c:forEach>
 										        	<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="basic_protocol"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=3&specific=${!isShowBusinessType}" extId="0"
 														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 649b36e35..652d3c1e4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -135,11 +135,19 @@
 								</div>
 								
 								<div class="pull-left">
+									<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+											<c:if test="${showBusinessType.itemCode==1 }">
+											<c:set var="isShowBusinessType" value="true"/>
+											</c:if>
+											<c:if test="${showBusinessType.itemCode!=1 }">
+											<c:set var="isShowBusinessType" value="false"/>
+											</c:if>
+									</c:forEach>
 									<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
-									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
+									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}"
 									 labelName="parent.specServiceName" notAllowSelectParent="true" notAllowSelectRoot="true" enableSearch="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=3&specific=${!isShowBusinessType}" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index c3ec903e0..edd9dba37 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -155,9 +155,6 @@ var delContent = function(contentClassName, addBtnClassName) {
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'encrypted_tunnel_behavior'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<h3 class="page-title">
 		<spring:message code="encrypted_tunnel_behavior"></spring:message>
 	</h3>
@@ -253,13 +250,21 @@ var delContent = function(contentClassName, addBtnClassName) {
 									<div class="row">
 										    <div class="col-md-6">
 										        <div class="form-group">
+										        	<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+															<c:if test="${showBusinessType.itemCode==1 }">
+															<c:set var="isShowBusinessType" value="true"/>
+															</c:if>
+															<c:if test="${showBusinessType.itemCode!=1 }">
+															<c:set var="isShowBusinessType" value="false"/>
+															</c:if>
+													</c:forEach>
 										            <c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
 										            <div class="col-md-6">
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" enableSearch="true"
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId="0"
 														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 049ba43af..d34ca7232 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -92,9 +92,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'encrypted_tunnel_behavior'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="encryptedtunnelbehav:config">
 			<button type="button" class="btn btn-primary"
@@ -135,11 +132,19 @@
 								</div>
 								
 								<div class="pull-left">
+									<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
+											<c:if test="${showBusinessType.itemCode==1 }">
+											<c:set var="isShowBusinessType" value="true"/>
+											</c:if>
+											<c:if test="${showBusinessType.itemCode!=1 }">
+											<c:set var="isShowBusinessType" value="false"/>
+											</c:if>
+									</c:forEach>
 									<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" enableSearch="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">