From 49405039d850c4256b1c3e87fd92c5cdbb08ff72 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 21 五月 2024 09:57:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
index b39e5e6..9ad1b32 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
@@ -5,7 +5,6 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -35,9 +34,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:hiddendanger:create")
public ApiResponse create(@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- LoginUserInfo loginUserInfo = getLoginUser(token);
- hiddenDanger.setCreator(loginUserInfo.getId());
- hiddenDanger.setMemberId(loginUserInfo.getMemberId());
+ hiddenDanger.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(hiddenDangerService.create(hiddenDanger));
}
@@ -61,6 +58,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:hiddendanger:update")
public ApiResponse updateById(@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(this.getLoginUser(token));
hiddenDangerService.updateById(hiddenDanger);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3