Преглед на файлове

司法工单数据权限

tangjiang преди 11 месеца
родител
ревизия
d683b2dc23
променени са 1 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 3 2
      src/Hotline.Api/Controllers/EnforcementOrderController.cs

+ 3 - 2
src/Hotline.Api/Controllers/EnforcementOrderController.cs

@@ -411,13 +411,14 @@ namespace Hotline.Api.Controllers
         public async Task<object> GetRegionalClassificationStatisticsAsync(DateTime StartDate, DateTime EndDate)
         {
             EndDate = EndDate.AddDays(1).AddSeconds(-1);
-
+            var areaCode = _sessionContext.OrgAreaCode ?? "511500";
             var list = await _enforcementOrdersRepository.Queryable()
                .Includes(x => x.Order)
                .Where(x => x.Order.Id != null)
                .Where(x => x.Order.StartTime >= StartDate && x.Order.StartTime <= EndDate)
                .LeftJoin<SystemArea>((x, o) => x.Order.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == o.Id)
                .Where((x, o) => x.Order.Status >= EOrderStatus.Filed)
+               .WhereIF(areaCode != "511500", (x, o) => x.Order.AreaCode.StartsWith(areaCode))
                .GroupBy((x, o) => new
                {
                    AreaCode = x.Order.AreaCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")),
@@ -452,7 +453,7 @@ namespace Hotline.Api.Controllers
             .Includes(x => x.Order)
             .Where(d => d.Order.Id != null)
             .Where(d => d.Order.StartTime >= dto.StartDate && d.Order.StartTime <= dto.EndDate)
-            .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.Order.AreaCode == dto.AreaCode)
+            .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.Order.AreaCode.StartsWith(dto.AreaCode))
             .WhereIF(dto.TheClueIsTrue == true, d => d.IsTheClueTrue == true)
             .WhereIF(dto.TheClueIsNotTrue == true, d => d.IsTheClueTrue == false)
             .WhereIF(dto.EnforcementOrder == true, d => d.IsEnforcementOrder == true)