From a8fb7ae2dbb61a94141ed5e73d3bb2632b7b84df Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期日, 28 九月 2025 15:25:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao --- server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java index 791dcff..cd51f4f 100644 --- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java +++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.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.SystemPosition; @@ -31,7 +31,7 @@ */ @Api(tags = "宀椾綅") @RestController -@RequestMapping("/cloudService/system/position") +@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/position") public class SystemPositionCloudController extends BaseController { @Autowired @@ -48,6 +48,7 @@ @PostMapping("/create") @CloudRequiredPermission("system:position:create") public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) { + systemPosition.setCreateUser(this.getLoginUser(token).getId()); return ApiResponse.success(systemPositionBiz.create(systemPosition)); } @@ -76,6 +77,7 @@ @PostMapping("/updateById") @CloudRequiredPermission("system:position:update") public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) { + systemPosition.setUpdateUser(this.getLoginUser(token).getId()); systemPositionBiz.updateById(systemPosition); return ApiResponse.success(null); } -- Gitblit v1.9.3