From a1866cc5c59e00f6200ad56cdc3cdccf00101c8b Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Tue, 3 Apr 2018 14:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E9=85=8D=E7=BD=AEAPP?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8IP=E6=97=B6=EF=BC=8C=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=BA=E5=9F=9F=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=EF=BC=8C=E7=89=B9=E5=BE=81=E9=85=8D=E7=BD=AE=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8C=BA=E5=9F=9F=E7=94=9F=E6=95=88=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/AppCfgController.java       |  8 +++
 .../webapp/WEB-INF/views/cfg/appCfgForm.jsp   | 59 ++++++++++---------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
index 13994bc54..25f798537 100644
--- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -102,6 +102,14 @@ public class AppCfgController extends BaseController {
 		//协议特征配置
 		List<ServiceConfigInfo> featuresList = serviceConfigInfoService.findList(serviceId);
 		model.addAttribute("featuresList",featuresList);
+		if(featuresList!=null){
+			for(ServiceConfigInfo s:featuresList){
+				if(s.getTableType()==2 || s.getTableType()==4){
+					model.addAttribute("isContainFeaturesCfg", true);
+					break;
+				}
+			}
+		}
 		//特征作用域信息
 		/*SysDictInfo sysDictInfo = new SysDictInfo();
 		sysDictInfo.setItemType(3);
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index ab9e6a927..414d181b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -122,33 +122,38 @@ $(function(){
 						            <div for="cfgDesc"></div>
 						        </div>
 						    </div>
-						    <div class="col-md-6">
-						        <div class="form-group">
-						            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-						            <div class="col-md-6">
-						            	<label class="radio-inline">
-						            		<input type="radio" class="required" name="isAreaEffective" value="1"
-						            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-						            		><spring:message code="yes"/>
-						            	</label>
-						            	<label class="radio-inline">
-						            		<input type="radio" class="required" name="isAreaEffective" value="0"
-						            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-						            		><spring:message code="no"/>
-						            	</label>
-						                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
-						            </div>
-						            <div for="isAreaEffective"></div>
-						        </div>
-						    </div>
-						    <div class="col-md-6">
-						        <div class="form-group ">
-						            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-						            <div class="col-md-6">
-						                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-						            </div>
-						        </div>
-						    </div>
+						    <c:if test="${isContainFeaturesCfg}">
+						    	<input type="hidden" name="isAreaEffective" value="0"/>
+						    </c:if>
+						    <c:if test="${!isContainFeaturesCfg}">	
+							    <div class="col-md-6">
+							        <div class="form-group">
+							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
+							            <div class="col-md-6">
+							            	<label class="radio-inline">
+							            		<input type="radio" class="required" name="isAreaEffective" value="1"
+							            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
+							            		><spring:message code="yes"/>
+							            	</label>
+							            	<label class="radio-inline">
+							            		<input type="radio" class="required" name="isAreaEffective" value="0"
+							            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+							            		><spring:message code="no"/>
+							            	</label>
+							                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
+							            </div>
+							            <div for="isAreaEffective"></div>
+							        </div>
+							    </div>
+							    <div class="col-md-6">
+							        <div class="form-group ">
+							            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
+							            <div class="col-md-6">
+							                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+							            </div>
+							        </div>
+							    </div>
+						    </c:if>
 						    <c:if test="${fn:length(featuresList)>0}">	
 						    	<c:set var="index1" value="0"/>
 						    	<c:set var="index2" value="0"/>