From 2f2812a7e88ce92d33225781f8d860dd3976ba2f Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Wed, 24 Oct 2018 16:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=91=98=E8=A6=81=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6=E7=9A=84=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C=20?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=EF=BC=8C=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=AD=90=E8=8A=82=E7=82=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/nis.properties              | 16 ++++++++--------
 src/main/webapp/WEB-INF/views/sys/roleForm.jsp |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index c4c50fb6c..23e7912c5 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -387,36 +387,36 @@ cert_upload_url_keyword=/intercept/strateagy
 #sample File Size 12M 12582912
 sample_total_file_max_size=12582912
 #audio File Types
-audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
+audio_file_type=
 #audio File Size 10M 10485760\uff08single\uff09 
 audio_single_file_max_size=0
 #speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b
-speaker_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
+speaker_file_type=
 #audio File Size 10M 10485760\uff08single\uff09 
 speaker_single_file_max_size=0
 #video File Types
-video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,
+video_file_type=
 #video File Size 10M 10485760\uff08single\uff09 
 video_single_file_max_size=0
 #face File Types \u4eba\u8138\u8bc6\u522b
-face_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,
+face_file_type=
 #face File Size 10M 10485760\uff08single\uff09 
 face_single_file_max_size=0
 #picture File Types
-picture_file_type=,bmp,jpg,tiff,raw,gif,
+picture_file_type=
 #picture File Size 10M 10485760\uff08single\uff09 
 picture_single_file_max_size=10485760
 #logo File Types \u53f0\u6807\u8bc6\u522b
-logo_file_type=,bmp,jpg,tiff,raw,gif,
+logo_file_type=
 #logo File Size 10M 10485760\uff08single\uff09 
 logo_single_file_max_size=10485760
 #voip File Types
-voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
+voip_file_type=
 #voip File Size 10M 10485760\uff08single\uff09 
 voip_single_file_max_size=0
 
 #digest File Types
-digest_file_type=,txt,doc,img,docx,pptx,xlsx,xls,ppt,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
+digest_file_type=
 #digest File Size 10M 10485760\uff08single\uff09
 digest_single_file_max_size=10485760
 #digest File Size 12M 12582912\uff08total\uff09 
diff --git a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
index c90fc107d..eb38d627e 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
@@ -60,7 +60,8 @@
 			}
 			// 默认展开全部节点
 			tree.expandAll(true);
-			
+			//隐藏没有分配父节点权限，却有子节点权限的叶子节点
+			$("#menuTree").children("li:not(:eq(0))").hide();
 		});
 		
 	</script>