Merge branch 'cherry-pick-10db5d0c' into 'develop_no_common_group'

由于日志未实现FTP Content功能，暂时修改为admin用户才可展示，后期ftp Content功能实现再打开。

See merge request K18_NTCS_WEB/NTC!44

src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp

@@ -233,7 +233,7 @@ $(document).ready(function(){
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
 								
 								<th  class="sort-column ftp_url" column="ftp_url"><spring:message code='ftp_url'/></th>
-								<th  class="sort-column ftp_content" column="ftp_content"><spring:message code='ftp_content'/></th>
+								<c:if test="${fns:getUser().isAdmin()}"><th  class="sort-column ftp_content" column="ftp_content"><spring:message code='ftp_content'/></th></c:if>
 								
 								<th class="sort-column cap_ip" isVisible="false" column="clj_ip"><spring:message code="clj_ip"/></th>
 								<th class="sort-column trans_proto" column="transport_layer_protocol"><spring:message code="transport_layer_protocol"/></th>
@@ -310,10 +310,10 @@ $(document).ready(function(){
 										</a>
 									</c:if> --%>	
 									</td>
-									
+									<c:if test="${fns:getUser().isAdmin()}">
 									<td>
 										${log.ftpContent}
-									</td>
+									</td></c:if>
 									<td >${log.capIp}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>