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 @@
AND r.is_valid=#{isValid,jdbcType=INTEGER}
-
+
AND r.dns_strategy_id=#{dnsStrategyId,jdbcType=INTEGER}
+
+ and r.dns_strategy_id in (select t.res_group_1_id from dns_res_strategy t where cfg_id=#{dnsStrategyId,jdbcType=INTEGER})
+
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