From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
index fc3363a..051279a 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
@@ -6,9 +6,9 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemDepartment;
@@ -46,8 +46,8 @@
@PostMapping("/create")
@CloudRequiredPermission("system:department:create")
public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
}
@@ -77,8 +77,8 @@
@PostMapping("/updateById")
@CloudRequiredPermission("system:department:update")
public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
systemDepartmentBiz.updateById(systemDepartment);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3