diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index b53303456..b63525dfd 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -61,7 +61,7 @@ left join sys_user u on r.auditor_id=u.id - AND ${page.where} + AND ${page.where} AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} @@ -69,8 +69,8 @@ AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - - AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%') + + AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER} AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER} diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp index ff3958537..59ec3e8c5 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp @@ -122,7 +122,7 @@ var reSort=function(obj,index){
- <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp index e068ca654..eaa612d83 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp @@ -66,7 +66,7 @@ $(function(){
- diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index 51a67c0c5..bb0bb0f2d 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -8,11 +8,9 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.srcIpAddress}"){ - $("#intype").val("${cfg.srcIpAddress}"); - }else if("${cfg.srcPort}"){ - $("#intype").val("${cfg.srcPort}"); - } else{ + }else if("${cfg.destIpAddress}"){ + $("#intype").val("${cfg.destIpAddress}"); + }else{ $("#intype").attr("placeholder"," "+$("#seltype").find("option:selected").text()); } $("#seltype").change(function(){ @@ -85,7 +83,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp index 6a1fe48ce..c04db97ef 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp @@ -73,7 +73,7 @@ $(function(){
- diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 01e62f164..30a35f7db 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -8,8 +8,8 @@ //搜索框提示语初始化 if("${cfg.cfgDesc}"){ $("#intype").val("${cfg.cfgDesc}"); - }else if("${cfg.srcIpAddress}"){ - $("#intype").val("${cfg.srcIpAddress}"); + }else if("${cfg.destIpAddress}"){ + $("#intype").val("${cfg.destIpAddress}"); }else if("${cfg.srcPort}"){ $("#intype").val("${cfg.srcPort}"); } else{