|
|
@@ -986,8 +986,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
d.Order.SourceChannelCode == "SZMHD" && d.Order.IsProvince == true) //政民互动
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.ProvinceChannel) && dto.ProvinceChannel == "3", d => d.Order.Source == ESource.ProvinceStraight &&
|
|
|
d.Order.SourceChannelCode == "S12345" && d.Order.IsProvince == true) //省12345
|
|
|
- .WhereIF(dto.PublishState.HasValue , d=>d.PublishState == dto.PublishState.Value) //发布范围 是否公开
|
|
|
- .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
|
|
|
+ .WhereIF(dto.PublishState.HasValue, d => d.PublishState == dto.PublishState.Value) //发布范围 是否公开
|
|
|
+ .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
|
|
|
.OrderByIF(dto is { SortRule: 0, SortField: "creationTime" }, d => d.Order.CreationTime, OrderByType.Asc) //受理时间
|
|
|
.OrderByIF(dto is { SortRule: 1, SortField: "creationTime" }, d => d.Order.CreationTime, OrderByType.Desc)
|
|
|
.OrderByIF(dto is { SortRule: 0, SortField: "filedTime" }, d => d.Order.FiledTime, OrderByType.Asc) //办结时间
|
|
|
@@ -6546,7 +6546,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
{
|
|
|
var isAdmin = _orderDomainService.IsCheckAdmin();
|
|
|
var query = _orderDelayRepository.Queryable();
|
|
|
- if (!isAdmin)
|
|
|
+ if (!isAdmin && _appOptions.Value.IsZiGong == false)
|
|
|
{
|
|
|
query.Where(d => SqlFunc.Subqueryable<WorkflowTrace>()
|
|
|
.Where(step => step.ExternalId == d.Id &&
|
|
|
@@ -6576,8 +6576,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
// .WhereIF(dto.DataScope is 0, d => (d.AutomaticDelayNum == 0 || d.AutomaticDelayNum == null) && d.DelayState != EDelayState.Withdraw)
|
|
|
.WhereIF(dto.DataScope is 0, d => d.DelayState != EDelayState.Withdraw)
|
|
|
.WhereIF(dto.DataScope is 0 && !_sessionContext.OrgIsCenter, d => d.CreatorOrgId.StartsWith(_sessionContext.RequiredOrgId))
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
|
|
|
- d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
|
|
|
.WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
|
|
|
.WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
|
|
|
.WhereIF(dto.DelayState != null, d => d.DelayState == dto.DelayState)
|
tangjiang