1

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1292,29 +1292,27 @@ WHERE
             if (_view.Code == 0)
             {
                 //发送消息
-                var taskUserData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.Id == dto.SubId).First();
-                if (taskUserData != null)
-                {
-                    var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == taskUserData.TAId).First();
+                var taskData = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskAllocation>().Where(it => it.Id == dto.Id).First();
 
-                    if (taskData != null)
-                    {
-                        var UserName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == taskData.CreateUserId).Select(it => it.CnName).First();
+                if (taskData != null)
+                {
+                    var userName = _taskAllocationRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == taskData.CreateUserId).Select(it => it.CnName).First();
 
-                        string title = $"[{taskData.TaskName}] 进度更新!";
-                        string conten_createUser = $"[{UserName}] 已知晓任务.若需查看,请前往任务页面查看详情!";
-                        string qw_conten_createUser = $"[{UserName}] 已知晓任务!";
+                    var taskUserIds = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).Select(x => x.UserId).ToList();
+                    var taskUserIdStrs = taskUserIds.Select(x => x.ToString()).ToList();
+                    string title = $"[{taskData.TaskName}] 进度更新!";
+                    string conten_createUser = $"[{userName}] 已知晓任务.若需查看,请前往任务页面查看详情!";
+                    string qw_conten_createUser = $"[{userName}] 已知晓任务!";
 
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, conten_createUser, new List<int>() { taskData.CreateUserId }); //创建人发送消息
 
-                        await AppNoticeLibrary.SendUserMsg_Task_ToUser(new List<string>() { taskData.CreateUserId.ToString() }, taskData.DiId, qw_conten_createUser, taskData.CreateUserId);
+                    await AppNoticeLibrary.SendUserMsg_Task_ToUser(new List<string>() { taskData.CreateUserId.ToString() }, taskData.DiId, qw_conten_createUser, taskData.CreateUserId);
 
-                        string content = $"请注意任务完成时间！若需查看,请前往任务页面查看详情!";
-                        string yw_content = $"请注意任务完成时间!";
-                        await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, new List<int>() { taskUserData.UserId }); //设置任务人 发送消息
-                        await AppNoticeLibrary.SendUserMsg_Task_ToUser(new List<string>() { taskUserData.UserId.ToString() }, taskData.DiId, yw_content, taskUserData.UserId);
+                    string content = $"请注意任务完成时间！若需查看,请前往任务页面查看详情!";
+                    string yw_content = $"请注意任务完成时间!";
+                    await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds); //设置任务人 发送消息
+                    await AppNoticeLibrary.SendUserMsg_Task_ToUser(taskUserIdStrs, taskData.DiId, yw_content, taskData.CreateUserId);
 
-                    }
                 }
 
                 return Ok(JsonView(true, "操作成功!"));