Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 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);
    }