|
@@ -2353,7 +2353,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
})
|
|
|
.WhereIF(dto.OrgType == 1, (it, o) => o.OrgType != EOrgType.County)
|
|
|
.WhereIF(dto.OrgType == 2, (it, o) => o.OrgType == EOrgType.County)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, o) => o.Name.StartsWith(dto.OrgName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, o) => o.Name.Contains(dto.OrgName))
|
|
|
.Select((it, o) => new DepartmentAcceptanceTypeStatisticsV1Dto
|
|
|
{
|
|
|
OrgName = o.Id == "001" ? centerOrgName : o.Name,
|
|
@@ -2414,6 +2414,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
.LeftJoin<SystemOrganize>((x, o) => x.ActualHandleOrgCode == o.Id)
|
|
|
.WhereIF(dto.OrgType == 1, (x, o) => o.OrgType != EOrgType.County)
|
|
|
.WhereIF(dto.OrgType == 2, (x, o) => o.OrgType == EOrgType.County)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (x, o) => o.Name.Contains(dto.OrgName))
|
|
|
.OrderByDescending(x => x.CreationTime);
|
|
|
}
|
|
|
|