From 295a4662e8332ca4b4f7fb19d550b609036d7248 Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac.cn>
Date: Fri, 22 Feb 2019 01:51:10 +0000
Subject: [PATCH] =?UTF-8?q?dns=20=E5=85=B3=E9=94=AE=E5=AD=97=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E9=85=8D=E7=BD=AE=EF=BC=9A=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=BB=84Id=EF=BC=8C=E7=94=B1groupId=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?serviceGroupId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d0994b7f986d16db67091308bdcc3bccb44ffcef)
---
 .../com/nis/domain/configuration/DnsKeywordCfg.java   |  8 ++++++++
 .../nis/web/service/basics/DnsKeywordCfgService.java  | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/com/nis/domain/configuration/DnsKeywordCfg.java b/src/main/java/com/nis/domain/configuration/DnsKeywordCfg.java
index fb8907346..16977011b 100644
--- a/src/main/java/com/nis/domain/configuration/DnsKeywordCfg.java
+++ b/src/main/java/com/nis/domain/configuration/DnsKeywordCfg.java
@@ -41,6 +41,8 @@ public class DnsKeywordCfg extends BaseCfg<DnsKeywordCfg>{
 	@SerializedName("district")
 	protected String district ;
 	protected String districtShowName;
+	
+	protected String dnsGroupName;
 	/**
 	 * 关键字
 	 */
@@ -231,4 +233,10 @@ public class DnsKeywordCfg extends BaseCfg<DnsKeywordCfg>{
 	public static String getTablename() {
 		return tableName;
 	}
+	public void setDnsGroupName(String dnsGroupName) {
+		this.dnsGroupName = dnsGroupName;
+	}
+	public String getDnsGroupName() {
+		return dnsGroupName;
+	}
 }
diff --git a/src/main/java/com/nis/web/service/basics/DnsKeywordCfgService.java b/src/main/java/com/nis/web/service/basics/DnsKeywordCfgService.java
index 0c3c30eda..33d6cfe93 100644
--- a/src/main/java/com/nis/web/service/basics/DnsKeywordCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/DnsKeywordCfgService.java
@@ -2,6 +2,7 @@ package com.nis.web.service.basics;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -76,6 +77,16 @@ public class DnsKeywordCfgService extends CrudService<CrudDao<DnsKeywordCfg>, Dn
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<DnsKeywordCfg> list=dnsKeywordCfgDao.findPage(entity);
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(12,1);
+		Map<String, String> policyGroupMap = new HashMap<String, String>();
+		for (PolicyGroupInfo policyGroupInfo : policyGroupInfos) {
+			if (!StringUtil.isEmpty(policyGroupInfo.getServiceGroupId())) {
+				policyGroupMap.put(policyGroupInfo.getServiceGroupId().toString(), policyGroupInfo.getGroupName()+"");
+			}
+		}
+		for (DnsKeywordCfg cfg : list) {
+			cfg.setDnsGroupName(policyGroupMap.get(cfg.getUserRegion1()));
+		}
 		page.setList(list);
 		return page;
 	}