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/MenuController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
index 4db9b5f..ac7892f 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
@@ -30,7 +30,7 @@
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuAddRPCReqDTO menuAddDto) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return accountMenuService.addMenu(currentUser.getUid(), menuAddDto);
+ return accountMenuService.addMenu(currentUser, menuAddDto);
}
@@ -40,7 +40,7 @@
@RequestMapping(value = "/mod",method = RequestMethod.POST)
public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuModRPCReqDTO menuModDto) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return accountMenuService.modMenu(currentUser.getUid(), menuModDto);
+ return accountMenuService.modMenu(currentUser, menuModDto);
}
@@ -51,7 +51,7 @@
public ResultVO<String> delMenu(Authentication authentication,@RequestBody JSONObject json ) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long id = json.getLong("id");
- return accountMenuService.delMenu(currentUser.getUid(), id);
+ return accountMenuService.delMenu(currentUser, id);
}
}
--
Gitblit v1.9.2