From 82449f1baf765ac88e958c6546edf691e87c0cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Wed, 12 Dec 2018 17:25:32 +0800
Subject: [PATCH] =?UTF-8?q?app=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=EF=BC=8C=E8=A1=8C=E4=B8=BA=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=A1=8C=E4=B8=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 081cf4c97..63d212a5d 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -94,6 +94,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<c:set var="functionID" value="${log.functionId}"/>
 							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
@@ -230,11 +231,13 @@ $(document).ready(function(){
 								<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
 								
 								<th class="sort-column label_proto_id"><spring:message code='basic_protocol'/></th>
-								<th class="sort-column label_proto_source" isVisible="false"><spring:message code='label_proto_source'/></th>
+								<%-- <th class="sort-column label_proto_source" isVisible="false"><spring:message code='label_proto_source'/></th> --%>
+								<c:if test="${functionID ne 407}">
 								<th class="sort-column label_behav_id"><spring:message code='behaviour_type'/></th>
-								<th class="sort-column label_behav_source" isVisible="false"><spring:message code='label_behav_source'/></th> 
+								</c:if>
+								<%-- <th class="sort-column label_behav_source" isVisible="false"><spring:message code='label_behav_source'/></th>  --%>
 								<th class="sort-column label_app_id"><spring:message code='social_app'/></th>
-								<th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> 
+								<%-- <th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> --%> 
 								<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
 								<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
 								<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
@@ -291,7 +294,6 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${entrances}"/>
 									</td>
-									
 									<td>
 									<c:set var="labelProtoIds">${log.labelProtoId }</c:set>
 										<c:forEach items="${protocolList}" var="dict">
@@ -301,9 +303,10 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${labelProtoIds}"/>
 									</td>
-									<td>
+									<%-- <td>
 												${log.labelProtoSource}
-									</td>
+									</td> --%>
+									<c:if test="${functionID ne 407}">
 									<td>
 									<c:set var="labelBehavIds">${log.labelBehavId }</c:set>
 										<c:forEach items="${behaviorList}" var="dict">
@@ -313,9 +316,10 @@ $(document).ready(function(){
 										</c:forEach>
 										<spring:message code="${labelBehavIds}"/>
 									</td>
-									<td>
+									</c:if>
+									<%-- <td>
 												${log.labelBehavSource}
-									</td>
+									</td> --%>
 									<td>
 									<c:set var="labelAppIds">${log.labelAppId }</c:set>
 										<c:forEach items="${appList}" var="dict">