From 388f2d3c0b620da1bb0311211b314749bc121bdd Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Mon, 3 Dec 2018 10:35:26 +0800
Subject: [PATCH] =?UTF-8?q?snat=E7=AD=96=E7=95=A5=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/IpAddrPoolCfgService.java  |  4 ++--
 .../service/configuration/IpMultiplexService.java    | 12 ++++++------
 .../manipulation/ipmulitiplex/snatPolicyForm2.jsp    |  4 ++--
 .../manipulation/ipmulitiplex/snatPolicyList2.jsp    |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
index b901a5f3a..95c8afc01 100644
--- a/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpAddrPoolCfgService.java
@@ -195,7 +195,7 @@ public class IpAddrPoolCfgService extends BaseService{
 				ip.setService(ipcfg.getServiceId());
 				ip.setAddrPoolId(cfg.getCfgId());
 				ip.setOpTime(auditTime);
-				//ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());//添加区域管控
+				ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());//添加区域管控
 				
 				resStrategyList.add(ip);
 			}
@@ -240,7 +240,7 @@ public class IpAddrPoolCfgService extends BaseService{
 				ip.setService(ipcfg.getServiceId());
 				ip.setAddrPoolId(cfg.getCfgId());
 				ip.setOpTime(auditTime);
-				//ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());
+				ip.setAreaEffectiveIds(cfg.getAreaEffectiveIds());
 				resStrategyList.add(ip);
 			}
 			//调用服务接口取消配置
diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
index a60e48b5b..56b2bafc2 100644
--- a/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
@@ -126,6 +126,7 @@ public class IpMultiplexService extends BaseService{
 		cfg = this.getPolicyCfg(cfg.getCfgId(), null);
 		String json="";
 		if(cfg.getIsAudit() == Constants.AUDIT_YES){
+			String areaEffectiveIds = cfg.getIsAreaEffective() == 1?sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()):"0";
 			Map<String, Object> params = new HashMap<String,Object>();
 			params.put("configId", cfg.getCompileId());
 			params.put("addrPoolId", cfg.getAddrPoolId());
@@ -133,9 +134,8 @@ public class IpMultiplexService extends BaseService{
 			params.put("userId", cfg.getUserId());
 			params.put("isValid", 1);
 			params.put("opTime", auditTime);
-			if(cfg.getIsAreaEffective() == 1){
-				params.put("effectiveRange", sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()));
-			}
+			params.put("effectiveRange", areaEffectiveIds);
+			
 			List list = Lists.newArrayList();
 			list.add(params);
 			//调用服务接口下发配置数据
@@ -153,6 +153,7 @@ public class IpMultiplexService extends BaseService{
 			}
 			
 		}else if(cfg.getIsAudit() == Constants.AUDIT_NOT_YES){
+			String areaEffectiveIds = cfg.getIsAreaEffective() == 1?sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()):"0";
 			Map<String, Object> params = new HashMap<String,Object>();
 			params.put("configId", cfg.getCompileId());
 			params.put("addrPoolId", cfg.getAddrPoolId());
@@ -160,9 +161,8 @@ public class IpMultiplexService extends BaseService{
 			params.put("userId", cfg.getUserId());
 			params.put("isValid", 0);
 			params.put("opTime", auditTime);
-			if(cfg.getIsAreaEffective() == 1){
-				params.put("effectiveRange", sysDictInfoService.setEffectiveRange(cfg.getAreaEffectiveIds()));
-			}
+			params.put("effectiveRange", areaEffectiveIds);
+			
 			List list = Lists.newArrayList();
 			list.add(params);
 			//调用服务接口取消配置
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
index 72d588048..9474516a5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
@@ -45,6 +45,7 @@ $(function(){
                             <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             <input type="hidden" name="compileId" value="${_cfg.compileId}">
                             <input type="hidden" name="functionId" value="${_cfg.functionId}">
+                            <input name="isAreaEffective" type="hidden" value="0">
                             <c:if test="${fn:length(serviceList)==1}">
 				            	<c:forEach items="${serviceList}" var="service">
 	                				<input type="hidden" name="action" serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode}" value="${service.action }">
@@ -159,8 +160,7 @@ $(function(){
 								        </div>
 								    </div>
 								</div>
-							<br>
-							<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+							<%-- <br><%@include file="/WEB-INF/include/form/areaInfo.jsp"%> --%>
 							<br>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
index 4095a13ac..581878972 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
@@ -293,7 +293,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="whether_area_block"/></th>
+									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -349,14 +349,14 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
-									<td>
+									<%-- <td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
 												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="selective"/>
 												</a>
 										</c:if>
-									</td>
+									</td> --%>
 									<td>${indexCfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>