From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..e7b1e34 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
@@ -3,16 +3,15 @@
import com.doumee.api.BaseController;
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.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
import com.doumee.dao.business.model.Devices;
import com.doumee.service.business.DevicesService;
import io.swagger.annotations.Api;
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