From ff61fa313ac660c964e116665bd0d5814e7c2fc4 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Wed, 20 Feb 2019 11:54:14 +0800
Subject: [PATCH] =?UTF-8?q?dns=E3=80=81url=E5=A2=9E=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E7=BB=84=E5=90=8E=E5=9C=A8=E5=88=97=E8=A1=A8=E4=B8=89?=
 =?UTF-8?q?=E8=A7=92=E5=8F=B7=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E7=BB=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/configuration/ntc/WebsiteController.java   | 2 ++
 .../controller/configuration/ntc/WhiteListController.java | 2 ++
 src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp  | 8 +++++---
 .../webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp  | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
index 947b0aae2..56b16eb15 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
@@ -457,6 +457,8 @@ public class WebsiteController extends BaseController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(12, 1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 12：dns 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 15438dbaf..c6cb58a53 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -249,6 +249,8 @@ public class WhiteListController extends CommonController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(11,  1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 11：url 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
index 65f5adb7b..fbed7af7f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -364,9 +364,11 @@
 			<div class="col-md-4">
 				<div class="form-group">
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
-					<label>
-						${_cfg.commonGroupIds}
-					</label>
+					<label> 
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
+					</label> 
 				</div>
 			</div>
 		</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
index 511008bca..380fe8f0e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -360,7 +360,9 @@
 				<div class="form-group">
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
 					<label>
-						${_cfg.commonGroupIds}
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
 					</label>
 				</div>
 			</div>