Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop

Conflicts:
	src/main/java/com/nis/web/service/BaseService.java
	asn group中修改组织变更和asn no变更，不重新获取groupId逻辑
	ip addr 的asn 修改为手动输入，后台check
	app ip和asn ip配置取消，取消分组中最后一条配置时，失效整个compile，并且修改groupId的状态为为无效。
	无效的asn group删除时，删除其下的所有asn ip

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -953,8 +953,24 @@ jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 		async:false,
 		url: url,
 		data:{"id":id,"asnId":value},
-		success:function(data){
-			result = data;
+		success:function(data,textStatus){	
+			if(textStatus=="success"){
+				if(data == null || data.id==null || data.id == 'undefined'){
+					result=true;
+				}else{
+					/*if($(element).attr("name") 
+							&& $(element).attr("name") != ''){
+						var name=$(element).attr("name").split(".");
+						console.log(name[0]);
+						if(name[1] == 'cfgKeywords'){
+							$("input[name='"+name[0]+".userRegion1']").val(data.regionId);
+							$("input[name='"+name[0]+".userRegion2']").val(data.groupId);
+						}
+					}*/
+					result=false;
+				}
+			}
+
 		}
 	});
 	return result;
@@ -963,18 +979,40 @@ jQuery.validator.addMethod("asnMustExists",function(value, element) {
 	var ctx=$(element).attr("ctx");
 	//var id= $("[name='id']").val();
 	var url = ctx+"/basics/asnGroup/checkAsnNo";
-	var result = true;
+	var result = false;
 	$.ajax({
 		type:'post',
 		async:false,
 		url: url,
 		data:{"asnId":value},
-		success:function(data){
-			if(data==true){
-				result=false;
-			}else{
-				result=true;
+		success:function(data,textStatus){	
+			if(textStatus=="success"){
+				if(data == null || data.id==null || data.id == 'undefined'){
+					result=false;
+				}else{
+					if($(element).attr("name") 
+							&& $(element).attr("name") != ''){
+						var name=$(element).attr("name").split(".");
+						console.log(name[0]);
+						if(name[1] == 'cfgKeywords'){
+							//校验成功的同时
+							$("input[name='"+name[0]+".userRegion1']").val(data.regionId);
+							$("input[name='"+name[0]+".userRegion2']").val(data.groupId);
+							$("input[name='"+name[0]+".userRegion3']").val(data.commonGroupIds);
+							var commonGroupIds=$("input[name='commonGroupIds']").val();
+							if(commonGroupIds !=null 
+									&& commonGroupIds != ''
+									&& (","+commonGroupIds+",").indexOf(","+data.commonGroupIds+",") < 0){
+								$("input[name='commonGroupIds']").val(commonGroupIds+","+data.commonGroupIds)
+							}else{
+								$("input[name='commonGroupIds']").val(data.commonGroupIds)
+							}
+						}
+					}
+					result=true;
+				}
 			}
+			
 		}
 	});
 	return result;