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/WEB-INF/views/basics/asnGroupForm.jsp

@@ -65,13 +65,14 @@ $(function(){
                       	<input type="hidden" name="groupId" value="${_cfg.groupId}">
                       	<input type="hidden" name="isValid" value="${_cfg.isValid}">
                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
+                      	<input type="hidden" name="regionId" value="${_cfg.regionId}">
                           <div class="form-body">
                               <div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
 								             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
 								            <div class="col-md-6">
-								                <input class="form-control required" type="text" name="organization" value="${_cfg.organization}" >
+								                <input class="form-control required " type="text" name="organization" value="${_cfg.organization}" >
 								            </div>
 								            <div for="organization"></div>
 								        </div>

src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp

@@ -282,10 +282,10 @@
 									<%-- <th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th> --%>
-									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="label"/></th> --%>									
 									<th><spring:message code="is_audit"/></th>
 									<%-- <th><spring:message code="log_total"/></th> --%>
+									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th column="editor" ><spring:message code="editor"/></th>
@@ -388,12 +388,7 @@
 											${fns:abbr(lableInfo,20)}
 										</a>
 									</td> --%>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>									
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
@@ -412,6 +407,11 @@
 										</c:choose> --%>
 									</td>
 									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>