From 70d02cb1c27f389e5f985e96026a94aa1b746e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= <xinyuanrenjie123@163.com>
Date: Fri, 29 Nov 2024 15:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8F=91=E5=B8=83=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=97=B6=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=88=A0=E9=99=A4=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=A4=A7=E5=8E=85=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E7=9A=84=E4=BB=BB=E5=8A=A1=E4=B8=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/AdminTaskManageApp.cs | 49 ++++++++++---------
 .../InsTaskHallManager/InsTaskHallApp.cs      |  2 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

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<string>
                     {
-                        queryid = insTaskInfo.Id,
-                        message = "有新创建的任务"
+                        Result = "添加成功",
+                        Message = "添加成功"
                     };
-                    var contents = Json.ToJson(content);
-                    try
-                    {
-                        await _immsgApp.SendMsgAll("InsTask", contents, insTaskInfo.Id);
-                        return new Response<string>
-                        {
-                            Result = "添加成功",
-                            Message = "添加成功"
-                        };
-                    }
-                    catch
-                    {
-                        return new Response<string>
-                        {
-                            Result = "添加成功",
-                            Message = "数据存储成功，推送失败"
-                        };
-                    }
                 }
                 else
                 {
@@ -406,14 +388,33 @@ namespace OpenAuth.App.ServiceApp
                     UpdateUserName = user.Name,
 
                 }, r => r.Id == id); ;
+
                 // 提交事务
                 if (db.Commit())
                 {
-                    return new Response<string>
+                    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<string>
+                        {
+                            Result = "发布成功",
+                            Message = "发布成功"
+                        };
+                    }
+                    catch
+                    {
+                        return new Response<string>
+                        {
+                            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
         /// <returns></returns>
         public async Task<List<dynamic>> GetTaskList()
         {
-            var query = await client.Queryable<InsTask>().Where(r => r.State!=2)
+            var query = await client.Queryable<InsTask>().Where(r => r.State!=2&&r.State!=3)
                 .LeftJoin<InsAishp>((r, p) => r.ShpId == p.Id)
                 .OrderByDescending(r=>r.CreateTime)
                 .Select<dynamic>((r, p) => new