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 @@