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 3a9192d02..fff9301a9 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -52,10 +52,10 @@ ,s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,dns.cfg_Desc as dns_strategy_name + ,ri.request_title as requestName,dns.group_name as dns_strategy_name from dns_ip_cfg r - left join dns_res_strategy dns on dns.cfg_Id=r.dns_strategy_id + left join policy_group_info dns on dns.group_id=r.dns_strategy_id left join sys_user s on r.creator_id=s.id left join sys_user e on r.editor_id=e.id left join sys_user u on r.auditor_id=u.id @@ -71,7 +71,7 @@ AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - AND dns.cfg_desc like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%') + AND dns.group_name like concat(concat('%',#{dnsStrategyName,jdbcType=VARCHAR}),'%') AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER} diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index f5168b7ca..0d5c6aa6d 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -419,12 +419,13 @@ public class HttpRedirectCfgService extends CrudService
-
-
@@ -93,7 +95,7 @@
@@ -121,7 +123,7 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 387a22c51..4412ca2b7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -161,7 +161,7 @@ $(function(){
- +
- +
+
+