田爽 1 년 전
부모
커밋
c69b0566bc
2개의 변경된 파일20개의 추가작업 그리고 20개의 파일을 삭제
  1. 19 19
      src/Hotline.Api/Controllers/SchedulingController.cs
  2. 1 1
      src/Hotline.Api/Controllers/WorkflowController.cs

+ 19 - 19
src/Hotline.Api/Controllers/SchedulingController.cs

@@ -292,25 +292,25 @@ namespace Hotline.Api.Controllers
 			await _schedulingRepository.UpdateAsync(scheduling, HttpContext.RequestAborted);
 		}
 
-		/// <summary>
-		/// 批量更新排班管理
-		/// </summary>
-		/// <param name="dto"></param>
-		/// <returns></returns>
-		[HttpPut("batch")]
-		public async Task Update([FromBody] List<UpdateDto> dto)
-		{
-			List<Scheduling> schedulings = new List<Scheduling>();
-			foreach (var item in dto)
-			{
-				var scheduling = await _schedulingRepository.GetAsync(item.Id, HttpContext.RequestAborted);
-				if (scheduling is null)
-					throw UserFriendlyException.SameMessage("无效排班信息");
-				_mapper.Map(dto, scheduling);
-				schedulings.Add(scheduling);
-			}
-			await _schedulingRepository.UpdateRangeAsync(schedulings, HttpContext.RequestAborted);
-		}
+		///// <summary>
+		///// 批量更新排班管理
+		///// </summary>
+		///// <param name="dto"></param>
+		///// <returns></returns>
+		//[HttpPut("batch")]
+		//public async Task Update([FromBody] List<UpdateDto> dto)
+		//{
+		//	List<Scheduling> schedulings = new List<Scheduling>();
+		//	foreach (var item in dto)
+		//	{
+		//		var scheduling = await _schedulingRepository.GetAsync(item.Id, HttpContext.RequestAborted);
+		//		if (scheduling is null)
+		//			throw UserFriendlyException.SameMessage("无效排班信息");
+		//		_mapper.Map(dto, scheduling);
+		//		schedulings.Add(scheduling);
+		//	}
+		//	await _schedulingRepository.UpdateRangeAsync(schedulings, HttpContext.RequestAborted);
+		//}
 
 
 		/// <summary>

+ 1 - 1
src/Hotline.Api/Controllers/WorkflowController.cs

@@ -555,7 +555,7 @@ public class WorkflowController : BaseController
             .Includes(x=>x.Members)
             .LeftJoin<Workflow>((c, w) => c.WorkflowId == w.Id)
             .InnerJoin<Order>((c, w, o) => w.ExternalId == o.Id)
-            .WhereIF(!_sessionContext.OrgIsCenter,x=>x.Members.Any(x=>x.Key== _sessionContext.OrgId))
+            .WhereIF(!_sessionContext.OrgIsCenter, (c, w, o) => c.Members.Any(m=>m.Key== _sessionContext.OrgId))
             .WhereIF(dto.IsProvince.HasValue, (c, w, o) => o.IsProvince == dto.IsProvince.Value)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
                 (c, w, o) => o.No.Contains(dto.Keyword) || o.Title.Contains(dto.Keyword));