From b57176c6c1868c70e422ba655b88ccfeceab4f3d Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Sun, 27 Jan 2019 18:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA:=20=E5=8E=BB=E6=8E=89IP=20Spoofing=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B=20bgp=E5=AF=BC=E5=87=BA=E6=97=A0action?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
	src/main/java/com/nis/util/excel/ExcelCsv.java
---
 .../java/com/nis/web/controller/log/ntc/BgpLogController.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
index 92f135aa0..ef64bd898 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java
@@ -116,6 +116,10 @@ public class BgpLogController extends BaseController {
 				if (fromJson.getStatus().intValue() == 200) {
 					Page<NtcBGPLog> data = fromJson.getData();
 					list = data.getList();
+					for (NtcBGPLog l : list) {
+						l.setFunctionId(log.getFunctionId());
+						setLogAction(l, serviceList);
+					}
 				}
 			}
 			titleList.add("bgp_control");