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/DepartmentController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
index b44713c..f045906 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
@@ -37,14 +37,14 @@
@RequestMapping(value = "/add", method = RequestMethod.POST)
public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return accountDepartmentService.addDep(currentUser.getUid(), depAddRPCReqDTO);
+ return accountDepartmentService.addDep(currentUser, depAddRPCReqDTO);
}
@RequestMapping(value = "/mod", method = RequestMethod.POST)
public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepModRPCReqDTO depModRPCReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return accountDepartmentService.modDep(currentUser.getUid(), depModRPCReqDTO);
+ return accountDepartmentService.modDep(currentUser, depModRPCReqDTO);
}
@@ -52,7 +52,7 @@
public ResultVO<String> addDepartment(Authentication authentication, @RequestBody JSONObject json) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long depId = json.getLong("depId");
- return accountDepartmentService.delDep(currentUser.getUid(), depId);
+ return accountDepartmentService.delDep(currentUser, depId);
}
--
Gitblit v1.9.2