Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/CommonPController.cs

@@ -109,7 +109,7 @@ namespace Hotline.Api.Controllers
             //工单
             var order = await _orderRepository.Queryable()
                .Includes(o => o.Workflow, w => w.Steps)
-               .Where(o => SqlFunc.JsonListObjectAny(o.Workflow.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(o.Workflow.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
+               .Where(o => SqlFunc.JsonListObjectAny(o.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(o.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
                .GroupBy(o => o.Id)
                .Select(o => new
                {
@@ -124,12 +124,12 @@ namespace Hotline.Api.Controllers
             //延期
             var delay = await _orderDelayRepository.Queryable()
                 .Includes(x=>x.Workflow)
-                .Where(x=> SqlFunc.JsonListObjectAny(x.Workflow.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(x.Workflow.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
+                .Where(x=> SqlFunc.JsonListObjectAny(x.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(x.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
                 .Where(x => x.DelayState == EDelayState.Examining).CountAsync();
             //甄别
             var screenAudit = await _orderScreenRepository.Queryable()
                 .Includes(x=>x.Workflow)
-				 .Where(x => SqlFunc.JsonListObjectAny(x.Workflow.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(x.Workflow.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
+				 .Where(x => SqlFunc.JsonListObjectAny(x.HandlerUsers, "Key", _sessionContext.RequiredUserId) || SqlFunc.JsonListObjectAny(x.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
 				.Where(x =>  x.Status == EScreenStatus.Apply)
                 .CountAsync();
 			var workTime = _timeLimitDomainService.CalcWorkTimeReduce(DateTime.Now, 5);