|
@@ -1051,11 +1051,11 @@ namespace OASystem.API.Controllers
|
|
if (dto.Type == 0) whereSql = "";
|
|
if (dto.Type == 0) whereSql = "";
|
|
else if (dto.Type == 1)
|
|
else if (dto.Type == 1)
|
|
{
|
|
{
|
|
- whereSql = string.Format(@" And ta.CreateUserId = {0} Or (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
|
|
+
|
|
}
|
|
}
|
|
else if (dto.Type == 2)
|
|
else if (dto.Type == 2)
|
|
{
|
|
{
|
|
- whereSql = string.Format(@" And (Select COUNT(1) As PeopleNumber From Pm_TaskRelevanceUser Where IsDel = 0 And ta.Id = TAId And UserId = {0}) > 0", dto.UserId);
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (dto.Status == -1)
|
|
if (dto.Status == -1)
|
|
@@ -1674,7 +1674,7 @@ WHERE
|
|
|
|
|
|
string title = $"[{taskData.TaskName}] 进度更新!";
|
|
string title = $"[{taskData.TaskName}] 进度更新!";
|
|
string content = $"任务已终止!若需查看,请前往任务页面查看详情!";
|
|
string content = $"任务已终止!若需查看,请前往任务页面查看详情!";
|
|
- string yw_content = $"任务已终止!";
|
|
+ string yw_content = $"[{taskData.TaskName}]任务已终止!";
|
|
await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds);
|
|
await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.TaskProgressUpdate, title, content, taskUserIds);
|
|
|
|
|
|
await AppNoticeLibrary.SendUserMsg_Task_ToUser(taskUserIds.Select(x => x.ToString()).ToList(), taskData.DiId, yw_content, taskData.CreateUserId);
|
|
await AppNoticeLibrary.SendUserMsg_Task_ToUser(taskUserIds.Select(x => x.ToString()).ToList(), taskData.DiId, yw_content, taskData.CreateUserId);
|