!1 管理菜单排序问题修改

Merge pull request !1 from 王冰臣/master

src/main/java/io/renren/modules/sys/controller/SysMenuController.java

@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.Collections;
+
 
 /**
  * 系统菜单
@@ -55,6 +57,10 @@ public class SysMenuController extends AbstractController {
 	@RequiresPermissions("sys:menu:list")
 	public List<SysMenuEntity> list(){
 		List<SysMenuEntity> menuList = sysMenuService.list();
+
+		//查询完成 对此list直接排序
+		Collections.sort(menuList);
+
 		HashMap<Long, SysMenuEntity> menuMap = new HashMap<>(12);
 		for (SysMenuEntity s : menuList) {
 			menuMap.put(s.getMenuId(), s);

src/main/java/io/renren/modules/sys/entity/SysMenuEntity.java

@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Data
 @TableName("sys_menu")
-public class SysMenuEntity implements Serializable {
+public class SysMenuEntity implements Serializable,Comparable<SysMenuEntity> {
 	private static final long serialVersionUID = 1L;
 	
 	/**
@@ -83,4 +83,8 @@ public class SysMenuEntity implements Serializable {
 	@TableField(exist=false)
 	private List<SysMenuEntity> list=new ArrayList<>();
 
+	@Override
+	public int compareTo(SysMenuEntity o) {
+		return this.getOrderNum()-o.getOrderNum();
+	}
 }

src/main/java/io/renren/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -78,6 +78,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 		// 查询拥有的所有菜单
 		List<SysMenuEntity> menus = this.baseMapper.selectList(new QueryWrapper<SysMenuEntity>()
 				.in(Objects.nonNull(menuIdList), "menu_id", menuIdList).in("type", 0, 1));
+		//查询完成 对此list直接排序
+		Collections.sort(menus);
+
 		// 将id和菜单绑定
 		HashMap<Long, SysMenuEntity> menuMap = new HashMap<>(12);
 		for (SysMenuEntity s : menus) {