Merge remote-tracking branch 'origin/master'

jiangping

2024-06-07 73af3ed9fbcc616cdecc739fc4307163c19c5764

 server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java

@@ -9,6 +9,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.system.model.SystemDataPermission;
import com.doumee.dao.system.vo.SystemDataPermissionListVO;
import com.doumee.service.system.SystemDataPermissionService;
@@ -43,7 +44,8 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("system:datapermission:create")
    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission) {
    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        systemDataPermission.setCreateUser(this.getLoginUser(token).getId());
        return ApiResponse.success(systemDataPermissionBiz.create(systemDataPermission));
    }

@@ -71,7 +73,8 @@
    @ApiOperation("修改")
    @PostMapping("/updateById")
    @RequiresPermissions("system:datapermission:update")
    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission) {
    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        systemDataPermission.setUpdateUser(this.getLoginUser(token).getId());
        systemDataPermissionBiz.update(systemDataPermission);
        return ApiResponse.success(null);
    }