| 
						
						
							
								
							
						
						
					 | 
					@ -25,10 +25,12 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<result property="updateTime"     column="update_time"    /> | 
					 | 
					 | 
							<result property="updateTime"     column="update_time"    /> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<result property="updateBy"       column="update_by"      /> | 
					 | 
					 | 
							<result property="updateBy"       column="update_by"      /> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<result property="remark"         column="remark"         /> | 
					 | 
					 | 
							<result property="remark"         column="remark"         /> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							<result property="remark"         column="remark"         /> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							<result property="distinguish"         column="distinguish"         /> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</resultMap> | 
					 | 
					 | 
						</resultMap> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						<sql id="selectMenuVo"> | 
					 | 
					 | 
						<sql id="selectMenuVo"> | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
							select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time | 
					 | 
					 | 
							select distinguish, menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
							from sys_menu | 
					 | 
					 | 
							from sys_menu | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</sql> | 
					 | 
					 | 
						</sql> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -41,6 +43,9 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								<if test="visible != null and visible != ''"> | 
					 | 
					 | 
								<if test="visible != null and visible != ''"> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									AND visible = #{visible} | 
					 | 
					 | 
									AND visible = #{visible} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								</if> | 
					 | 
					 | 
								</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							 <if test="distinguish != null and distinguish != ''"> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
									AND distinguish=#{distinguish} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								<if test="status != null and status != ''"> | 
					 | 
					 | 
								<if test="status != null and status != ''"> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
									AND status = #{status} | 
					 | 
					 | 
									AND status = #{status} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								</if> | 
					 | 
					 | 
								</if> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -49,7 +54,7 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</select> | 
					 | 
					 | 
						</select> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						<select id="selectMenuTreeAll" resultMap="SysMenuResult"> | 
					 | 
					 | 
						<select id="selectMenuTreeAll" 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.distinguish, 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 where m.menu_type in ('M', 'C') and m.status = 0 | 
					 | 
					 | 
							from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							order by m.parent_id, m.order_num | 
					 | 
					 | 
							order by m.parent_id, m.order_num | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</select> | 
					 | 
					 | 
						</select> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -69,6 +74,9 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							</if> | 
					 | 
					 | 
							</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="status != null and status != ''"> | 
					 | 
					 | 
							<if test="status != null and status != ''"> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								AND m.status = #{status} | 
					 | 
					 | 
								AND m.status = #{status} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							  <if test="distinguish != null and distinguish != ''"> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								AND m.distinguish = #{distinguish} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							</if> | 
					 | 
					 | 
							</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							order by m.parent_id, m.order_num | 
					 | 
					 | 
							order by m.parent_id, m.order_num | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</select> | 
					 | 
					 | 
						</select> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -143,6 +151,7 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								<if test="icon !=null and icon != ''">icon = #{icon},</if> | 
					 | 
					 | 
								<if test="icon !=null and icon != ''">icon = #{icon},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								<if test="remark != null and remark != ''">remark = #{remark},</if> | 
					 | 
					 | 
								<if test="remark != null and remark != ''">remark = #{remark},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> | 
					 | 
					 | 
								<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
								<if test="distinguish != null and distinguish != ''">distinguish = #{distinguish},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								update_time = sysdate() | 
					 | 
					 | 
								update_time = sysdate() | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							</set> | 
					 | 
					 | 
							</set> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							where menu_id = #{menuId} | 
					 | 
					 | 
							where menu_id = #{menuId} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -166,6 +175,7 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="icon != null and icon != ''">icon,</if> | 
					 | 
					 | 
							<if test="icon != null and icon != ''">icon,</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="remark != null and remark != ''">remark,</if> | 
					 | 
					 | 
							<if test="remark != null and remark != ''">remark,</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="createBy != null and createBy != ''">create_by,</if> | 
					 | 
					 | 
							<if test="createBy != null and createBy != ''">create_by,</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							<if test="distinguish != null">distinguish,</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							create_time | 
					 | 
					 | 
							create_time | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							)values( | 
					 | 
					 | 
							)values( | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="menuId != null and menuId != 0">#{menuId},</if> | 
					 | 
					 | 
							<if test="menuId != null and menuId != 0">#{menuId},</if> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -184,6 +194,7 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="icon != null and icon != ''">#{icon},</if> | 
					 | 
					 | 
							<if test="icon != null and icon != ''">#{icon},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="remark != null and remark != ''">#{remark},</if> | 
					 | 
					 | 
							<if test="remark != null and remark != ''">#{remark},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							<if test="createBy != null and createBy != ''">#{createBy},</if> | 
					 | 
					 | 
							<if test="createBy != null and createBy != ''">#{createBy},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
							<if test="distinguish != null ">#{distinguish},</if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							sysdate() | 
					 | 
					 | 
							sysdate() | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							) | 
					 | 
					 | 
							) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						</insert> | 
					 | 
					 | 
						</insert> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |