From 609a75db672875d06dcc93b5fcd7af3f17231a53 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Fri, 22 Feb 2019 02:06:35 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=BA=E6=9C=AC=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE-common-group=20DNS=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3a1580bb0c2f4a29a171c169f07b6e59238aac87)
---
 .../WEB-INF/views/basics/policyGroupList.jsp  | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
index 959cd9e97..fed616513 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
@@ -290,20 +290,22 @@
 											${fns:abbr(cfg.groupName,20)}
 										</a>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.groupType==6 }">
-												<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:when>
-											<c:otherwise>
-												<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:otherwise>
-										</c:choose>
-									</td>
+									<c:if test="${cfg.groupType!=12&&cfg.groupType!=11}">
+										<td>
+											<c:choose>
+												<c:when test="${cfg.groupType==6 }">
+													<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
+														<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
+							               			</c:forEach>
+												</c:when>
+												<c:otherwise>
+													<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
+														<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
+							               			</c:forEach>
+												</c:otherwise>
+											</c:choose>
+										</td>
+									</c:if>
 									<%-- <c:if test="${cfg.groupType==4}">
 									<td>${cfg.asnNo}</td>
 									</c:if> --%>