DNS策略模块，不展示无欺骗IP的组,DNS配置恢复原状

src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java

@@ -57,7 +57,8 @@ public class DnsResStrategyController extends BaseController  {
 		}
 		
 		//查询policyGroup列表，供响应策略选择
-		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
+//		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findHasIpPolicyGroupInfosByType(1);
 		model.addAttribute("policyGroups", policyGroups);
 		
 		model.addAttribute("_cfg", cfg);

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -323,7 +323,7 @@ public class WebsiteController extends BaseController{
 			initFormCondition(model,entity);
 		}
 		//获取所有响应策略信息
-		List<DnsResStrategy> resStrategys=dnsResStrategyService.findhasValidIpResStrategys(null, 1,1);
+		List<DnsResStrategy> resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1);
 		model.addAttribute("dnsResStrategys", resStrategys);
 		model.addAttribute("_cfg", entity);
 		return "/cfg/website/dnsForm";

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java

@@ -12,6 +12,7 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
 	List<PolicyGroupInfo> findPolicyGroupInfoList(PolicyGroupInfo policyGroupInfo);
 	List<PolicyGroupInfo> findPolicyGroupInfos();
 	List<PolicyGroupInfo> findPolicyGroupInfosByType(int groupType);
+	List<PolicyGroupInfo> findHasIPPolicyGroupInfosByType(int groupType);
 	List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int groupType);
 	PolicyGroupInfo getById(int id);
 	

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml

@@ -73,6 +73,15 @@
 	    FROM policy_group_info r
 	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
 	</select>
+      <select id="findHasIPPolicyGroupInfosByType" resultMap="PolicyGroupInfoMap">
+		SELECT
+			<include refid="PolicyGroupInfoColumns"/>
+	    FROM (
+	    SELECT DISTINCT dns_strategy_id FROM dns_ip_cfg WHERE is_valid=1 AND is_audit=1
+		) a
+		LEFT JOIN policy_group_info r ON a.dns_strategy_id=r.group_id
+	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
+	</select>
 	<insert id="insert" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
     insert into policy_group_info(
      IS_VALID,

src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java

@@ -49,6 +49,10 @@ public class PolicyGroupInfoService extends BaseService{
 		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
 		return list;
 	}
+	public List<PolicyGroupInfo> findHasIpPolicyGroupInfosByType(int type) {
+		List<PolicyGroupInfo> list=policyGroupInfoDao.findHasIPPolicyGroupInfosByType(type);
+		return list;
+	}
 	public List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int type) {
 		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
 		return list;