From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
index 19be730..ba0e027 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
@@ -12,7 +12,6 @@
import io.swagger.annotations.ApiOperation;
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 javax.servlet.http.HttpServletResponse;
@@ -36,8 +35,8 @@
@PostMapping("/create")
@RequiresPermissions("business:devices:create")
public ApiResponse create(@RequestBody Devices devices) {
- devices.setCreator(getLoginUser().getId());
- devices.setEditor(getLoginUser().getId());
+ devices.setCreator(getLoginUser(null).getId());
+ devices.setEditor(getLoginUser(null).getId());
return ApiResponse.success(devicesService.create(devices));
}
@@ -66,7 +65,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:devices:update")
public ApiResponse updateById(@RequestBody Devices devices) {
- devices.setEditor(getLoginUser().getId());
+ devices.setEditor(getLoginUser(null).getId());
devicesService.updateById(devices);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3