From 55e2272333e564747221383142565c41ea2c35b6 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Sat, 15 Jun 2019 18:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=95=BF=E5=BA=A6=E8=B6=85=E8=BF=8720?=
 =?UTF-8?q?=E7=9C=81=E7=95=A5=E5=8F=B7=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAdoLog=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/excel/ExportExcel.java  |  4 +++
 .../configuration/ObjectGroupController.java  |  2 +-
 .../WEB-INF/views/cfg/objgroup/list.jsp       | 30 +++++++++++++++----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java
index 58f311adf..4eba0b414 100644
--- a/src/main/java/com/nis/util/excel/ExportExcel.java
+++ b/src/main/java/com/nis/util/excel/ExportExcel.java
@@ -2725,6 +2725,10 @@ public class ExportExcel {
 							}
 							
 						}
+						if(ef.title().equals("do_log")
+								&& (Reflections.invokeGetter(e, "serviceId").toString().equals("512"))) {
+							val = "";
+						}
 						if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
 							Integer whetherAreaBlock=Integer.parseInt(valStr);
 							if(whetherAreaBlock.equals(0)){
diff --git a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java
index 63c15a2dd..72d34e581 100644
--- a/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ObjectGroupController.java
@@ -407,7 +407,7 @@ public class ObjectGroupController extends BaseController {
 
             titleList.add(entity.getMenuNameCode());
             classMap.put(entity.getMenuNameCode(), ObjGroupCfg.class);
-            String cfgIndexInfoNoExport=",block_type,do_log,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-";
+            String cfgIndexInfoNoExport=",block_type,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&action:block_type-";
 
             // 时间过滤
             if (entity.getSearch_create_time_start() == null) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
index 076ac7a9a..b52a01a91 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
@@ -76,27 +76,47 @@
 					$("td[commonGroupIds]").each(function(){
 						for(var key in data.ipGroup){
 							if($(this).text().trim()==key){
-								$(this).text(data.ipGroup[key]);
+								if(data.ipGroup[key].length<20){
+									$(this).text(data.ipGroup[key]);
+								}else{
+									$(this).text(data.ipGroup[key].substring(0,20)+"...");
+								}
+								$(this).attr("title",data.ipGroup[key]);
 							}
 						}
 					});
 					$("td[urlGroup]").each(function(){
 						for(var key in data.urlGroup){
 							if($(this).text().trim()==key){
-								$(this).text(data.urlGroup[key]);
+								if(data.urlGroup[key].length<20){
+									$(this).text(data.urlGroup[key]);
+								}else{
+									$(this).text(data.urlGroup[key].substring(0,20)+"...");
+								}
+								$(this).attr("title",data.urlGroup[key]);
 							}
 						}
 					});
 					$("td[domainGroup]").each(function(){
 						for(var key in data.domainGroup){
 							if($(this).text().trim()==key){
-								$(this).text(data.domainGroup[key]);
+								if(data.domainGroup[key].length<20){
+									$(this).text(data.domainGroup[key]);
+								}else{
+									$(this).text(data.domainGroup[key].substring(0,20)+"...");
+								}
+								$(this).attr("title",data.domainGroup[key]);
 							}
 						}
 					});$("td[subscribeIdGroup]").each(function(){
 						for(var key in data.subscribeIdGroup){
 							if($(this).text().trim()==key){
-								$(this).text(data.subscribeIdGroup[key]);
+								if(data.subscribeIdGroup[key].length<20){
+									$(this).text(data.subscribeIdGroup[key]);
+								}else{
+									$(this).text(data.subscribeIdGroup[key].substring(0,20)+"...");
+								}
+								$(this).attr("title",data.subscribeIdGroup[key]);
 							}
 						}
 					});
@@ -463,7 +483,7 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog  and cfg.action!=64}">
+											<c:if test="${dict.itemCode eq cfg.doLog  and cfg.serviceId!=512}">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>