diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs index 635e7396..46e57312 100644 --- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs @@ -2240,9 +2240,10 @@ namespace DS.WMS.Core.TaskPlat.Method var userId = long.Parse(user.UserId); //任务列表分组统计 var groupList = await tenantDb.Queryable() - .ClearFilter(typeof(IOrgId)) + .ClearFilter(typeof(IOrgId)) .LeftJoin((t, a) => t.Id == a.TaskId) .Where(whereList) + .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .Where((t, a) => t.IS_PUBLIC == 1 || (t.IS_PUBLIC == 0 && a.Status != null && (a.UserId == userId))) // 2024-8-14 boss提出只显示自己需要审批的任务,自己创建的任务不显示,所以去掉t.CreateBy == userId || .GroupBy((t, a) => new { t.TASK_TYPE, t.STATUS, a.Status, t.IS_PUBLIC }) .Select((t, a) => new @@ -2708,7 +2709,9 @@ namespace DS.WMS.Core.TaskPlat.Method string status, long userId) { - queryable.ClearFilter(typeof(IOrgId)).Where(whereList) + queryable.ClearFilter(typeof(IOrgId)) + .Where(whereList) + .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .WhereIF(taskType != null, (t, a) => t.TASK_TYPE == taskType.ToString()) .WhereIF(taskStatLevel == TaskStatLevelEnum.PUBLIC, (t, a) => t.IS_PUBLIC == 1 && t.STATUS == status) .WhereIF(taskStatLevel == TaskStatLevelEnum.PERSON, (t, a) => t.IS_PUBLIC == 0 @@ -2727,7 +2730,9 @@ namespace DS.WMS.Core.TaskPlat.Method string status, long userId) { - queryable.ClearFilter(typeof(IOrgId)).Where(whereList) + queryable.ClearFilter(typeof(IOrgId)) + .Where(whereList) + .Where((t, a) => t.STATUS != TaskStatusEnum.Cancel.ToString()) .WhereIF(taskType != null, (t, a) => t.TASK_TYPE == taskType.ToString()) .WhereIF(taskStatLevel == TaskStatLevelEnum.PUBLIC, (t, a) => t.IS_PUBLIC == 1 && t.STATUS == status) .WhereIF(taskStatLevel == TaskStatLevelEnum.PERSON, (t, a) => t.IS_PUBLIC == 0