From 76a7156b6908bf4b0a3d0b2ee18ceefacb510383 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 29 五月 2024 12:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
index 4670e06..f0af8bf 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemPosition;
import com.doumee.dao.system.vo.SystemPositionListVO;
@@ -19,11 +20,11 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.web.bind.annotation.*;
/**
* 宀椾綅鎺ュ彛
* @author Eva.Caesar Liu
@@ -47,7 +48,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("system:position:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) {
+ public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemPosition.setCreateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemPositionBiz.create(systemPosition));
}
@@ -75,7 +77,8 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@RequiresPermissions("system:position:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) {
+ public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemPosition.setUpdateUser(this.getLoginUser(token).getId());
systemPositionBiz.updateById(systemPosition);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3