From 9e8316603a48b92e366e66ad9e4503984b7235ed Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Wed, 16 Jan 2019 19:31:45 +0600
Subject: [PATCH] =?UTF-8?q?asn=20is=5Fvalid=3D0=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=88=A0=E9=99=A4=E5=85=B6=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?asn=20ip;=20asn=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0is=5Fvalid=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9is=20issued=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/service/basics/AsnGroupInfoService.java    | 2 ++
 src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp      | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java
index 1efebbf1e..c8535f342 100644
--- a/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/AsnGroupInfoService.java
@@ -224,6 +224,8 @@ public class AsnGroupInfoService extends BaseService{
 			List<AsnGroupInfo> asnList=asnGroupInfoDao.findAsnGroupInfoByAsnNos(Arrays.asList(asnIds.split(",")), 1);
 			//修改asn为无效，且解除引用
 			asnGroupInfoDao.updateIsUsedAndIsValid(Arrays.asList(asnIds.split(",")), 0, -1);
+			//删除asn下的所有asn IP
+			asnIpCfgDao.deleteByAsnId(asnIds);
 			
 			//查询已经被策略引用的asn，需要走取消接口
 			if(!StringUtil.isEmpty(asnList)){
diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
index 8a99ebe5c..a6f6975f5 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
@@ -233,7 +233,8 @@
 									<th class="sort-column r.country"><spring:message code="country"/></th>
 									<th class="sort-column r.detail"><spring:message code="detail"/></th>
 									<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
-									<th class="sort-column r.is_valid"><spring:message code="is_issued"/></th>
+									<th class="sort-column r.is_used"><spring:message code="is_issued"/></th>
+									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -263,6 +264,10 @@
 										</a>
 									</td>
 									<td>${cfg.asnId}</td>
+									<td>
+										<c:if test="${cfg.isUsed==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isUsed==1}"><spring:message code="yes"/></c:if>
+									</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>