dns 关键字分组配置：配置的分组Id，由groupId改为serviceGroupId

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;
+	}
 }

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;
 	}