diff --git a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs index 42aaf2f..4c0e19d 100644 --- a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs +++ b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs @@ -128,29 +128,11 @@ namespace OpenAuth.App.ServiceApp // 提交事务 if (db.Commit()) { - var content = new + return new Response { - queryid = insTaskInfo.Id, - message = "有新创建的任务" + Result = "添加成功", + Message = "添加成功" }; - var contents = Json.ToJson(content); - try - { - await _immsgApp.SendMsgAll("InsTask", contents, insTaskInfo.Id); - return new Response - { - Result = "添加成功", - Message = "添加成功" - }; - } - catch - { - return new Response - { - Result = "添加成功", - Message = "数据存储成功,推送失败" - }; - } } else { @@ -406,14 +388,33 @@ namespace OpenAuth.App.ServiceApp UpdateUserName = user.Name, }, r => r.Id == id); ; + // 提交事务 if (db.Commit()) { - return new Response + var content = new { - Result = "发布成功", - Message = "发布成功" + queryid = insTaskInfo.Id, + message = "有新发布的任务" }; + var contents = Json.ToJson(content); + try + { + await _immsgApp.SendMsgAll("InsTask", contents, insTaskInfo.Id); + return new Response + { + Result = "发布成功", + Message = "发布成功" + }; + } + catch + { + return new Response + { + Result = "发布成功", + Message = "数据存储成功,推送失败" + }; + } } else { diff --git a/OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs b/OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs index 3e45795..81a8ea2 100644 --- a/OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs +++ b/OpenAuth.App/ServiceApp/InsTaskHallManager/InsTaskHallApp.cs @@ -33,7 +33,7 @@ namespace OpenAuth.App.ServiceApp.InsTaskHallManager /// public async Task> GetTaskList() { - var query = await client.Queryable().Where(r => r.State!=2) + var query = await client.Queryable().Where(r => r.State!=2&&r.State!=3) .LeftJoin((r, p) => r.ShpId == p.Id) .OrderByDescending(r=>r.CreateTime) .Select((r, p) => new