From 31edf93fdc70f8dbba4165696fb21babfce80cf6 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@zdjizhi.com>
Date: Thu, 21 Feb 2019 15:35:29 +0800
Subject: [PATCH] =?UTF-8?q?dns/url=E5=85=AC=E5=85=B1=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=96=E8=A1=A8policy=5Fgroup=5Finfo=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84id=E7=94=B1groupId=E6=94=B9=E4=B8=BAserviceGroupId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp            | 2 +-
 src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp            | 2 +-
 src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp
index 231bd9c0c..dac537d18 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp
@@ -53,7 +53,7 @@
 	            	 <select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
 		               		<option value=""><spring:message code="select"/></option>
 		               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
-		               			<option value="${dnsGroupInfo.groupId}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}">selected</c:if>>${dnsGroupInfo.groupName}</option>
+		               			<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}">selected</c:if>>${dnsGroupInfo.groupName}</option>
 		               	</c:forEach>
 		               </select>
 	            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp b/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp
index 488f27437..bcb7c5a0d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp
@@ -53,7 +53,7 @@
 	            	 <select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
 		               		<option value=""><spring:message code="select"/></option>
 		               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
-		               			<option value="${urlGroupInfo.groupId}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.groupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
+		               			<option value="${urlGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.serviceGroupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
 		               	</c:forEach>
 		               </select>
 	            </div>
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 fbed7af7f..83097d07e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
@@ -366,7 +366,7 @@
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
 					<label> 
 						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
-		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if> 
 		               	</c:forEach> 
 					</label> 
 				</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 380fe8f0e..9d11743ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -361,7 +361,7 @@
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
 					<label>
 						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
-		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if> 
 		               	</c:forEach> 
 					</label>
 				</div>