diff --git a/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs b/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs index 758e504..e5dc893 100644 --- a/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs +++ b/OpenAuth.App/ServiceApp/Task/PersonTaskApp.cs @@ -30,21 +30,27 @@ public class PersonTaskApp : SqlSugarBaseApp throw new Exception("登录失效"); } + List userIds; + if (string.IsNullOrEmpty(req.UserId)) + { + userIds = await Repository.ChangeRepository>() + .AsQueryable().InnerJoin((a, b) => a.Id == b.GroupId) + .Where(a => a.GroupLeaderId == userId) + .Select((a, b) => b.UserId) + .ToListAsync(); + } + else + { + userIds = new List(1) { userId }; + } - var userIds = await Repository.ChangeRepository>() - .AsQueryable().InnerJoin((a, b) => a.Id == b.GroupId) - .Where(a => a.GroupLeaderId == userId) - .Select((a, b) => b.UserId) - .ToListAsync(); - - userIds.Add(userId); RefAsync total = 0; var result = await Repository.AsQueryable() .RightJoin((a, b) => a.Id == b.TaskId) .Where((a, b) => userIds.Contains(b.ReciveUserId)) - .WhereIF(!string.IsNullOrEmpty(req.key),(a,b)=>a.TaskName.Contains(req.key)) - .OrderBy((a,b)=> b.CreateTime,OrderByType.Desc) + .WhereIF(!string.IsNullOrEmpty(req.key), (a, b) => a.TaskName.Contains(req.key)) + .OrderBy((a, b) => b.CreateTime, OrderByType.Desc) .Select((a, b) => new InsTaskExtend { RowNumber = SqlSugar.SqlFunc.RowNumber(b.Id), @@ -84,7 +90,7 @@ public class PersonTaskApp : SqlSugarBaseApp .RightJoin((a, b) => a.Id == b.TaskId) .InnerJoin((a, b, c) => a.ShpId == c.Id) .Where((a, b) => b.Id == taskGroupId) - .Select((a, b,c) => new InsTaskExtend + .Select((a, b, c) => new InsTaskExtend { TaskName = a.TaskName, // 任务名称 GroupName = b.GroupName, // 任务分组包 diff --git a/OpenAuth.App/ServiceApp/Task/Request/PersonTaskQuery.cs b/OpenAuth.App/ServiceApp/Task/Request/PersonTaskQuery.cs index 5a360bc..e56997e 100644 --- a/OpenAuth.App/ServiceApp/Task/Request/PersonTaskQuery.cs +++ b/OpenAuth.App/ServiceApp/Task/Request/PersonTaskQuery.cs @@ -4,4 +4,5 @@ namespace OpenAuth.App.ServiceApp.Task.Request; public class PersonTaskQuery : PageReq { + public string UserId { get; set; } } \ No newline at end of file