From 2404bd69a48b10015d68f6c701402c87dc8cbb99 Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac.cn>
Date: Fri, 22 Feb 2019 10:56:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=8F=90dns=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E7=BB=84=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp | 2 +-
 .../webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp   | 2 +-
 src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp
index 39849444a..f53064a45 100644
--- a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp
@@ -135,7 +135,7 @@ var reSort=function(obj,index){
 								            	 <select name="userRegion1" 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}">${dnsGroupInfo.groupName}</option>
+									               			<option value="${dnsGroupInfo.serviceGroupId}">${dnsGroupInfo.groupName}</option>
 									               	</c:forEach>
 								               	</select>
 								            </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp
index 72dd9ead4..b600d1218 100644
--- a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp
@@ -90,7 +90,7 @@ $(function(){
 								            	 <select name="userRegion1" 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.userRegion1 eq dnsGroupInfo.groupId }">selected</c:if>>${dnsGroupInfo.groupName}</option>
+									               			<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${cfg.userRegion1 eq dnsGroupInfo.serviceGroupId }">selected</c:if>>${dnsGroupInfo.groupName}</option>
 									               			
 									               	</c:forEach>
 								               	</select>
diff --git a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp
index 71ed6b594..401c0a959 100644
--- a/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp
@@ -265,7 +265,9 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
-									<td>${cfg.userRegion1}</td>
+									<td>
+									${cfg.dnsGroupName}
+									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>