专题广告分析，央视剧场分析，增加菜单权限关系

src/main/webapp/WEB-INF/jsp/analysis/special_analysis.jsp

@@ -70,7 +70,9 @@
 		</form>
 	</div>
 	<div class="table-content">
-		<div class="hd-title">专题广告电视投放一览<a href="javascript:document.dataForm.submit();" style="line-height: 16px;" class="rFloat btn">导出</a></div>
+        <c:if test="${funcMap['ztgg_analysis_export'] eq 1}">
+			<div class="hd-title">专题广告电视投放一览<a href="javascript:document.dataForm.submit();" style="line-height: 16px;" class="rFloat btn">导出</a></div>
+		</c:if>
 		<div class="">
 			<table class="table table-gray" cellpadding="0" cellspacing="0">
 				<thead>

src/main/webapp/WEB-INF/jsp/analysis/theatre_analysis.jsp

@@ -63,7 +63,9 @@
 		</form>
 	</div>
 	<div class="table-content">
-		<div class="hd-title">央卫视电视剧收视指标一览<a href="javascript:document.dataForm.submit();" style="line-height: 16px;" class="rFloat btn mBottom10">导出</a></div>
+        <c:if test="${funcMap['ywjc_analysis_export'] eq 1}">
+			<div class="hd-title">央卫视电视剧收视指标一览<a href="javascript:document.dataForm.submit();" style="line-height: 16px;" class="rFloat btn mBottom10">导出</a></div>
+		</c:if>
 		<div class="">
 			<table class="table table-gray" cellpadding="0" cellspacing="0" id="program_analysis_list_table">
 				<thead>
@@ -94,7 +96,9 @@
 		</div>
 	</div>
 	<div class="table-content">
-		<div class="hd-title" id="program_placement_div_1">央卫视电视剧收视明细<a href="javascript:document.detailForm.submit();" style="line-height: 16px;" class="rFloat btn mBottom10">导出</a></div>
+        <c:if test="${funcMap['ywjc_analysis_detail_export'] eq 1}">
+			<div class="hd-title" id="program_placement_div_1">央卫视电视剧收视明细<a href="javascript:document.detailForm.submit();" style="line-height: 16px;" class="rFloat btn mBottom10">导出</a></div>
+		</c:if>
 		<div class="" id="program_placement_div_2">
             <form name="detailForm" action="export_detail_list.do" method="post">
                 <input name="startDate" id="start_time_1" type="hidden"/>

src/main/webapp/WEB-INF/jsp/system/update_role.jsp

@@ -34,7 +34,9 @@
 								<input type="checkbox" name="permissionId" value="${first.permissionId }" class="parent checkbox {click:subAll}" <c:if test="${fn:contains(rolePerms,','.concat(first.permissionId).concat(','))}">checked</c:if> /><label>${first.name}</label>
 								<div class="sub_auth">
 									<c:forEach var="second" items="${first.subPerms}">
-										<input type="checkbox" name="permissionId" value="${second.permissionId }" class="checkbox {click:subchildren} " <c:if test="${fn:contains(rolePerms,','.concat(second.permissionId).concat(','))}">checked</c:if> ><label>${second.name}</label>
+										<c:if test="${second.code ne 'ztgg_analysis_mng' and second.code ne 'ywjc_analysis_mng' }">
+									    	<input type="checkbox" name="permissionId" value="${second.permissionId }" class="checkbox {click:subchildren} " <c:if test="${fn:contains(rolePerms,','.concat(second.permissionId).concat(','))}">checked</c:if> ><label>${second.name}</label>
+										</c:if>
 									</c:forEach>
 								</div>
 							</li>