diff --git a/OpenAuth.App/ServiceApp/DataAnalysisApp.cs b/OpenAuth.App/ServiceApp/DataAnalysisApp.cs index ec354f4..ed2c2ca 100644 --- a/OpenAuth.App/ServiceApp/DataAnalysisApp.cs +++ b/OpenAuth.App/ServiceApp/DataAnalysisApp.cs @@ -207,6 +207,7 @@ namespace OpenAuth.App.ServiceApp .LeftJoin((a, b) => a.ReciveUserId == b.Id.ToString()) .WhereIF(beginTime.Year != 0001, a => a.CreateTime >= beginTime && a.CreateTime <= endTime) .WhereIF(groupUser.Count > 0, a => groupUser.Contains(a.ReciveUserId)) + .Where((a,b)=>!string.IsNullOrEmpty(a.ReciveUserId)) .GroupBy((a, b) => b.Name) .Select((a, b) => new UserOrGroupTaskResp { @@ -228,6 +229,7 @@ namespace OpenAuth.App.ServiceApp .LeftJoin((a, b, c) => b.GroupId == c.Id) .WhereIF(beginTime.Year != 0001, a => a.CreateTime >= beginTime && a.CreateTime <= endTime) .WhereIF(groupUser.Count > 0, a => groupUser.Contains(a.ReciveUserId)) + .Where((a, b) => !string.IsNullOrEmpty(a.ReciveUserId)) .GroupBy((a, b, c) => c.Name) .Select((a, b, c) => new UserOrGroupTaskResp {