Merge remote-tracking branch 'origin/master'

nidapeng

2024-05-06 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e

 server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.service.business.ProjectsService;
@@ -35,9 +36,9 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:projects:create")
    public ApiResponse create(@RequestBody Projects projects) {
        projects.setCreator(getLoginUser().getId());
        projects.setEditor(getLoginUser().getId());
    public ApiResponse create(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        projects.setCreator(getLoginUser(token).getId());
        projects.setEditor(getLoginUser(token).getId());
        return ApiResponse.success(projectsService.create(projects));
    }

@@ -65,7 +66,8 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:projects:update")
    public ApiResponse updateById(@RequestBody Projects projects) {
    public ApiResponse updateById(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        projects.setEditor(getLoginUser(token).getId());
        projectsService.updateById(projects);
        return ApiResponse.success(null);
    }