From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
index c7b3ca3..1abbf63 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
@@ -34,6 +34,6 @@
@RequestMapping("/menu")
public ResultVO<List<MenuRPCRespDTO>> getMenu(Authentication authentication, Long projectId){
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return accountAuthService.getMenu(currentUser.getUid(), projectId);
+ return accountAuthService.getMenu(currentUser, projectId);
}
}
--
Gitblit v1.9.2