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
     	<trim prefix="WHERE" prefixOverrides="AND |OR ">
     		<if test="page !=null and page.where != null and page.where != ''">
-				 AND ${page.where}
+				AND ${page.where}
 			</if>
     		<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
@@ -69,8 +69,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="asnIpGroupName != null and asnIpGroupName != ''">
-	    		AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%') 
+	    	<if test="asnIpGroup != null and asnIpGroup != ''">
+	    		AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="cfgRegionCode != null">
 	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index d41212c61..29569f53f 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -617,7 +617,7 @@ val_dst_ip=Server IP format is incorrect or inconsistent with IP type
 val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type
 val_dst_port=Server port is empty or incorrectly formatting(0-65535)
 val_dst_port_mask=Server port mask format is incorrect(0-65535)
-val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4EFB\u610F)
+val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4efb\u610f)
 val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
 #===============protocol IP Import end=================
 
@@ -983,7 +983,7 @@ attr_type_report=Attribute Report
 lwhh_report=Official Letter Report
 src_ip_report=Src IP Report
 dest_ip_report=Dest IP Report
-isp_report=ISP Report
+isp_report=Entrance Report
 #=============about report===================
 ip_multiplex_policy=IP Reuse Policy
 ip_multiplex_pool_config=IP Reuse Addr Pool
@@ -1139,4 +1139,9 @@ asn_ip_configuration=ASN IP Configuration
 asn_policy=ASN Policy
 asn_ip_group=ASN IP Group
 can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP
-last_ip_in_asn_group=Can not delete last IP in an ASN group
\ No newline at end of file
+last_ip_in_asn_group=Can not delete last IP in an ASN group
+
+#==============================about reoirt=========================================
+src_province=Str Province
+src_city=Src City
+dest_country=Dest IP Country
\ No newline at end of file
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){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required">
+								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 								            		<%-- <option value="0" ><spring:message code="default_group"/></option>--%>
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
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(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required">
+								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
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","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
 		$("#seltype").change(function(){
@@ -85,7 +83,7 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" >
+                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
                        				 	<form:option value=""><spring:message code='asn_ip_group'/></form:option>
                        				 	<c:forEach items="${policyGroups}" var="policyGroup">
                        				 	<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 4b2dc61ff..88514d82c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -33,7 +33,10 @@
 			$(".Wdate").attr("value",'');
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+ 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+ 			$("#specServiceIdId").val("");
+			$("#specServiceIdName").val("");
+			$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
 		});
 		//异步获取策略ip相关信息
 		$("span[id^=open]").click(function(){
@@ -80,6 +83,8 @@
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
 		}); 
+		
+		
 	}); 
 </script>
 
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(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="userRegion1" class="selectpicker show-tick form-control required">
+								            	<select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion1==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index d32876c3e..a772ee8e9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -36,6 +36,9 @@
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+			$("#specServiceIdId").val("");
+			$("#specServiceIdName").val("");
+			$("#specServiceIdName").attr("placeholder",'<spring:message code="basic_protocol"/>');
 		});
 		//异步获取策略ip相关信息
 		$("span[id^=open]").click(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{
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index a72db7637..55f5216e3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -36,6 +36,9 @@
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+			$("#specServiceIdId").val("");
+			$("#specServiceIdName").val("");
+			$("#specServiceIdName").attr("placeholder",'<spring:message code="encrypted_tunnel_behavior"/>');
 		});
 		//异步获取策略ip相关信息
 		$("span[id^=open]").click(function(){
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index e2aebcfe5..205deaa78 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1310,6 +1310,7 @@ var GetLogTotal=function(_data){
 		success:function(data,textStatus){//处理返回结果
 			if(textStatus=="success"){
 				totalTrs.each(function(){
+					var hasLog=false;
 					for(var i=0;i<data.length;i++){
 						if($(this).attr("compileId")==data[i].compileId){
 							$(this).attr("id",i+"logTotal");
@@ -1318,8 +1319,12 @@ var GetLogTotal=function(_data){
 							}else{
 								$(this).html(data[i].sum);
 							}
+							hasLog=true;
 						}
 					}
+					if(!hasLog){
+						$(this).html("0");
+					}
 				})
 			}
 		},