From 19f5f603fb890e84e43fadcf3135e660802026d0 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期二, 28 六月 2022 14:51:13 +0800
Subject: [PATCH] 解决冲突
---
src/app/modules/base/service/sys/menu.ts | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/modules/base/service/sys/menu.ts b/src/app/modules/base/service/sys/menu.ts
index 48d8c1d..f0a3429 100644
--- a/src/app/modules/base/service/sys/menu.ts
+++ b/src/app/modules/base/service/sys/menu.ts
@@ -42,6 +42,7 @@
}
});
}
+ console.log(menus, "menus")
return menus;
}
@@ -99,10 +100,10 @@
FROM
t_sys_menu a
${this.setSql(
- !isAdmin,
- 'JOIN t_sys_role_menu b on a.id = b.menuId AND b.roleId in (?)',
- [roleIds]
- )}
+ !isAdmin,
+ 'JOIN t_sys_role_menu b on a.id = b.menuId AND b.roleId in (?)',
+ [roleIds]
+ )}
GROUP BY a.id
ORDER BY
orderNum ASC`);
--
Gitblit v1.9.1