From c3c7c363e09c35e33a856257d311491ff6722892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Thu, 13 Dec 2018 11:56:19 +0800
Subject: [PATCH] =?UTF-8?q?dns=E6=89=80=E6=9C=89=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=9D=87=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=AC=BA=E9=AA=97ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml | 5 ++++-
 .../jquery-validation/1.11.0/jquery.validate.method.js      | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
index 815a502b8..6cb35f3af 100644
--- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
@@ -197,9 +197,12 @@
     		<if test="isValid != null">
 	    		AND r.is_valid=#{isValid,jdbcType=INTEGER}
 	    	</if>
-    		<if test="dnsStrategyId != null">
+    		<if test="dnsStrategyId != null and dnsStrategyId ==0">
 	    		AND r.dns_strategy_id=#{dnsStrategyId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="dnsStrategyId != null and dnsStrategyId !=0">
+	    		and r.dns_strategy_id in (select t.res_group_1_id from dns_res_strategy t where cfg_id=#{dnsStrategyId,jdbcType=INTEGER})
+	    	</if>
     	</where>
     </select>
     
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
index af2f41f77..e24c3c119 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -1016,18 +1016,18 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) {
 // DNS阻断无策略校验
 jQuery.validator.addMethod("noStrategyCheck",function(value,element) {
 	var flag = true;
-	if(value == 0){
+	//if(value == 0){
 		var ctx = $(element).attr("ctx");
 		var url = ctx+"/cfg/dnsIp/dnsNoStrategyCheck";
 		$.ajax({
 			type:'post',
 			async:false,
 			url: url,
-			data:{"dnsStrategyId":0},
+			data:{"dnsStrategyId":value},
 			success:function(data){
 				flag = data;
 			}
 		});
-	}
+	//}
 	return flag;
 });
\ No newline at end of file