From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
index 5267d67..958da56 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
@@ -4,12 +4,11 @@
import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import lombok.Data;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
/**
* @ClassName AccountInfoVO
@@ -65,6 +64,10 @@
removeAttribute(menu);
}
}
+ //menu������������
+ if (!ObjectUtils.isEmpty(menus)) {
+ orderRootMenu(menus);
+ }
vo.setAccountId(account.getId());
vo.setUserName(account.getUserName());
vo.setMenus(menus);
@@ -85,4 +88,39 @@
}
}
+
+ /**
+ * @Description: ������������������������
+ * @Param: [menus]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/6/8
+ */
+ public static void orderRootMenu(List<ManageMenu> menus){
+ menus.sort(Comparator.comparing(ManageMenu::getOrder));
+ for (ManageMenu menu : menus) {
+ orderMenu(menu);
+ }
+ }
+
+ /**
+ * @Description: ���������������������������
+ * @Param: [menu]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/6/8
+ */
+ public static void orderMenu(ManageMenu menu){
+ List<ManageMenu> children = menu.getChildren();
+ if(!ObjectUtils.isEmpty(children)){
+ children.sort(Comparator.comparing(ManageMenu::getOrder));
+ for (ManageMenu child : children) {
+ orderMenu(child);
+ }
+ }else{
+ return;
+ }
+ }
+
+
}
--
Gitblit v1.8.0