| 
					
				 | 
			
			
				@@ -71,7 +71,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	</select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from sys_menu m 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join sys_role_menu rm on m.menu_id = rm.menu_id 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -155,7 +155,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectMenu" parameterType="Long" resultType="Long"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		select distinct m.menu_id from sys_menu m 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		join sys_role_menu rm on m.menu_id = rm.menu_id  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		join sys_role_menu rm on m.menu_id = rm.menu_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		join sys_role ro on rm.role_id = ro.role_id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         where ro.role_id=#{roleId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	</select> 
			 |