From 995fa9aad12f8b67e1e9f7ab922573138684a24a Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sat, 29 Dec 2018 14:53:48 +0800
Subject: [PATCH] =?UTF-8?q?APP=E7=89=B9=E5=BE=81=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0import=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/app/appMultiFeatureCfgList.jsp  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
index 17a2162cc..d4cc85f7a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
@@ -116,6 +116,26 @@
 				onClick="javascript:window.location='${ctx}/app/feature/multiFeatureCfgForm?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
+		
+		
+		<c:set var="serviceImport" value="false"></c:set>
+		<c:set var="regionImport" value="false"></c:set>
+		<c:forEach items="${serviceList}" var="service" >
+			<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
+				<c:set var="serviceImport" value="true"></c:set>
+			</c:if>
+		</c:forEach>
+		<c:forEach items="${regionList}" var="region" >
+			<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
+				<c:set var="regionImport" value="true"></c:set>
+			</c:if>
+		</c:forEach>
+		<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
+			<button type="button" class="btn btn-primary import" >
+				<i class="fa fa-plus"></i>
+			<spring:message code="import"></spring:message></button>
+		</c:if>
+		
 		</shiro:hasPermission>
 	</div>
 
@@ -420,6 +440,8 @@
 				</div>
 			</div>
 </div>
-
+<c:set var="importPath" value="/ntc/website/dnsList?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+	 <%@include file="/WEB-INF/include/excel/importModal.jsp" %>
 </body>
 </html>
\ No newline at end of file