diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 4dbee6de1..9cb812f03 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -297,6 +297,14 @@ public class ExcelCsv { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr); //如果找不到字典国际化值,把字典本身作为默认值放进去,不然导出就是空了 val = msgProp.getProperty(dict,dict); + //业务配置-stream 阻断类型中 阻断 改为 封堵(丢弃) + if("block_type".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "serviceId").toString().equals("35") + || Reflections.invokeGetter(e, "serviceId").toString().equals("33") + || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){ + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } } } diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index d9ada668d..2d0e613e2 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2266,6 +2266,14 @@ public class ExportExcel { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr); //如果找不到字典国际化值,把字典本身作为默认值放进去,不然导出就是空了 val = msgProp.getProperty(dict,dict); + //业务配置-stream 阻断类型中 阻断 改为 封堵(丢弃) + if("block_type".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "serviceId").toString().equals("35") + || Reflections.invokeGetter(e, "serviceId").toString().equals("33") + || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){ + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } } }