From ebcb89ef137a62b0a4656e5f7689c4371bce1c80 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Sat, 19 Jan 2019 15:59:15 +0600
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=9A=84crl=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BF=85=E5=A1=AB=EF=BC=9B=20asn=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag   | 47 ++++++++++---------
 .../views/cfg/intercept/strateagy/form.jsp    |  4 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 91b4c3a47..db67b470f 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -429,32 +429,37 @@ function cancelPassOpt(url){
 		var compileIdStr="";
 		checkboxes.each(function(){
 		    if(true == $(this).is(':checked')){
-	    		  compileIdStr +=$(this).parent().find("span[cfgid='"+$(this).attr("id")+"']").attr("compileId")+",";
+		    	var compileId=$(this).parent().find("span[cfgid='"+$(this).attr("id")+"']").attr("compileId");
+		    	if(compileId != null && compileId !='' && compileId != 'undefined'){
+	    		  	compileIdStr +=compileId+",";
+		    	}
 		    }
 		  });
 		//根据compileId查询，此配置下是否有配置已经删除
-		$.ajax({
-			type:'post',
-			url:'${ctx}/basics/asnGroup/checkAsnRegionIsDeleted',
-			data:{"compileIds":compileIdStr},
-			async:false,
-			success:function(data,textStatus){//处理返回结果
-				if(textStatus == 'success'){
-					var keyValue="";
-					for(var key in data){   //key    data[key]
-				        console.log(key + "==" + data[key]);	
-				        keyValue+=data[key]+"<br>";
-				    }
-					if(keyValue !=''){
-						top.$.jBox.info(keyValue+"<spring:message code='reedit'/>","<spring:message code='info'/>");
-						top.$('.jbox-body .jbox-icon').css('top','55px');
-						flag= true;
+		if(compileIdStr != null && compileIdStr !='' && compileIdStr != 'undefined'){
+			$.ajax({
+				type:'post',
+				url:'${ctx}/basics/asnGroup/checkAsnRegionIsDeleted',
+				data:{"compileIds":compileIdStr},
+				async:false,
+				success:function(data,textStatus){//处理返回结果
+					if(textStatus == 'success'){
+						var keyValue="";
+						for(var key in data){   //key    data[key]
+					        console.log(key + "==" + data[key]);	
+					        keyValue+=data[key]+"<br>";
+					    }
+						if(keyValue !=''){
+							top.$.jBox.info(keyValue+"<spring:message code='reedit'/>","<spring:message code='info'/>");
+							top.$('.jbox-body .jbox-icon').css('top','55px');
+							flag= true;
+						}
+						
 					}
-					
+					/* window.location = url+"&ids="+ids+"&compileIds="+compileIds; */
 				}
-				/* window.location = url+"&ids="+ids+"&compileIds="+compileIds; */
-			}
-		});
+			});
+		}
 		return flag;
 	}
 	//验证是否可删除
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index 2274bbda1..2bdb4e3ed 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -344,9 +344,9 @@ function privateFileValidate(){
 								    </div>
 								    <div class="col-md-6">
 									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="CRL"/></label>
+									            <label class="control-label col-md-3"><spring:message code="CRL"/></label>
 									            <div class="col-md-6">
-									            	 <input class="form-control required crlCheck" type="text" name="crl" value="${_cfg.crl}">
+									            	 <input class="form-control crlCheck" type="text" name="crl" value="${_cfg.crl}">
 									            </div>
 											    <div for="crl"></div>
 									        </div>