From cb8543b802db2aa3891e93c3ca3a1eeb5bea0663 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周四, 15 5月 2025 14:59:53 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs index 22406bb..1ebb01c 100644 --- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs +++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs @@ -3,6 +3,7 @@ using CMS.Framework.AspNetCore.Users; using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan; using CMS.Plugin.PipeLineLems.Application.Contracts.Services; +using CmsQueryExtensions.Entitys; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -66,7 +67,7 @@ /// </summary> /// <param name="input">杈撳叆.</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPost] public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input) { @@ -79,7 +80,7 @@ /// <param name="id">鏍囪瘑绗�.</param> /// <param name="input">杈撳叆.</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPut] [Route("{id}")] public virtual Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input) @@ -92,7 +93,7 @@ /// </summary> /// <param name="ids">Id闆嗗悎.</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPost] [Route("Clone")] public virtual Task<List<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids) @@ -105,7 +106,7 @@ /// </summary> /// <param name="id">鏍囪瘑绗�.</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpDelete] [Route("{id}")] public virtual Task DeleteAsync(Guid id) @@ -118,7 +119,7 @@ /// </summary> /// <param name="ids">The ids.</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpDelete] public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) { @@ -152,6 +153,11 @@ var userAccount = _currentUser.UserAccount; var userId = _currentUser.UserId; + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; var sheetNames = stream.GetSheetNames(); var workPlanRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WorkPlansImportModel.WorkPlanImportModel>(stream, sheetName: "閰嶇疆").ToList() : new(); -- Gitblit v1.9.3