dns、url增加公共组后在列表三角号中显示公共组名称

(cherry picked from commit ff61fa313a)

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -457,6 +457,8 @@ public class WebsiteController extends BaseController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(12, 1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 12：dns 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);

src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java

@@ -249,6 +249,8 @@ public class WhiteListController extends CommonController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(11,  1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 11：url 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);

src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp

@@ -364,9 +364,11 @@
 			<div class="col-md-4">
 				<div class="form-group">
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
-					<label>
-						${_cfg.commonGroupIds}
-					</label>
+					<label> 
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
+					</label> 
 				</div>
 			</div>
 		</div>

src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp

@@ -360,7 +360,9 @@
 				<div class="form-group">
 <%-- 					<label><spring:message code='asn_no'/>:</label> --%>
 					<label>
-						${_cfg.commonGroupIds}
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
 					</label>
 				</div>
 			</div>