From 138ccc9fe4798e5335c49a6407e8cdc70e1ff122 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 24 十一月 2022 16:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java b/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
index 8e6bba2..1c34d74 100644
--- a/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
+++ b/src/main/java/com/qxueyou/scc/sys/service/impl/PriviledgeService.java
@@ -324,11 +324,11 @@
String hql = "select m.menuId as index ,m.name as title ,m.url as router , m.hover as hover , "
+ " m.icon as icon ,m.parentMenuId as parentMenuId ,m.menuOrder as menuOrder from SysMenu m , UserReRoleUser u ,"
+ "SysPrivilege s where m.deleteFlag is false and u.deleteFlag is false and s.deleteFlag is false and "
- + "u.userId =:userId and u.roleId = s.roleId and s.menuId = m.menuId order by m.menuOrder ";
+ + "u.userId =:userId and u.roleId = s.roleId and s.menuId = m.menuId order by m.menuOrder ";
List<Map<String, Object>> menuLst = findListWithMapByHql(hql,
CollectionUtils.newObjectMap("userId", user.getUserId()));
-
+ System.out.println(menuLst);
for (Map<String, Object> map : menuLst) {
map.put("children", CollectionUtils.newList());
}
--
Gitblit v1.8.0