| 
					
				 | 
			
			
				@@ -54,7 +54,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						m.menu_name, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						m.path, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						m.component, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						m.query, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						m.`query`, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						m.visible, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						m.status, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						ifnull(m.perms, '') as perms, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -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 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -92,7 +92,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		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 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 left join sys_user_role ur on rm.role_id = ur.role_id 
			 |