From e6d02f62fb34799427dc160aefc414f38366ddc4 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Thu, 30 Aug 2018 17:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8B=E5=8F=91=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/FileTransferCfgService.java        |  8 +++++++-
 .../views/cfg/fileTransfer/fileDigestForm.jsp        | 12 ++++++------
 .../views/cfg/fileTransfer/fileDigestSubList.jsp     | 12 ++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 4f165e93a..3e22080c4 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -531,7 +531,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		// 修改域配置审核状态
 		if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
 			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
-			BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId"});
+			BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId","cfgType"});
 			stringCfgDao.updateSubscribeIdCfg(cfg);
 		}
 		
@@ -565,6 +565,12 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 				if(map.get("numRegionList")!=null){
 					numRegionList.addAll(map.get("numRegionList"));
 				}
+				// 审核通过：添加各子域配置
+				if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
+					Map<String,List> subIdMap = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
+					groupRelationList=subIdMap.get("groupList");
+					strRegionList=subIdMap.get("dstList");
+				}
 				
 				if(areaIpCfgList != null && areaIpCfgList.size() >0){
 					Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 4f4dd7d7e..9ff08b6da 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -56,9 +56,9 @@
 				}); */
 				if(flag){
 					//将disable属性的元素删除
-					/* $(".disabled").each(function(){
+					$(".disabled").each(function(){
 						$(this).remove();
-					}); */
+					});
 					$("input[name$='exprType']").attr("disabled",false);
 					/* if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
 						$("input[name$='exprType']").val(1);
@@ -130,10 +130,10 @@
 							<!-- 配置域类型 -->
 							<c:forEach items="${regionList}" var="region">
 								<c:if test="${_cfg.functionId eq region.functionId}">
-									<input type="hidden" name="cfgType"
-										value="${region.configRegionValue}">
-									<input type="hidden" name="cfgRegionCode"
-										value="${region.configRegionCode}">
+									<c:if test="${region.configServiceType ne 'subscribe_id'}">
+										<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+										<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
+									</c:if>
 								</c:if>
 							</c:forEach>
 							<div class="form-body">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
index 6d2d6a00c..4bce0abb5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp
@@ -11,6 +11,18 @@
 </style>
 </head>
 
+<c:if test="${fn:length(tabList)==0}">
+	<div id="NTC_UNIVERSAL_IPInfo${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+					<spring:message code='no_data' />
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
+
 <c:forEach items="${tabList}" var="region" varStatus="regionStatus">
 	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
 		class="col-md-1 tabInfo" name="tabTitle${index }">