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/RoleController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
index 34ff3cd..739e029 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
@@ -42,7 +42,7 @@
     @RequestMapping(value = "/add",method = RequestMethod.POST)
     public ResultVO<String> addRole(Authentication authentication, RoleAddRPCReqDTO roleAddRPCReqDTO){
         ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
-        return accountRoleService.addRole(currentUser.getUid(),roleAddRPCReqDTO);
+        return accountRoleService.addRole(currentUser,roleAddRPCReqDTO);
     }
 
 
@@ -50,7 +50,7 @@
     @RequestMapping(value = "/mod",method = RequestMethod.POST)
     public ResultVO<String> modRole(Authentication authentication, RoleModRPCReqDTO roleModRPCReqDTO){
         ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
-        return accountRoleService.modRole(currentUser.getUid(),roleModRPCReqDTO);
+        return accountRoleService.modRole(currentUser,roleModRPCReqDTO);
     }
 
 
@@ -58,6 +58,6 @@
     public ResultVO<String> modRole(Authentication authentication, JSONObject json){
         ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
         Long depId = json.getLong("depId");
-        return accountRoleService.delRole(currentUser.getUid(),depId);
+        return accountRoleService.delRole(currentUser,depId);
     }
 }

--
Gitblit v1.9.2