From 2829654a33d9b82bb8ef974d02fd4407412f3f54 Mon Sep 17 00:00:00 2001
From: gaofei <231232131@163.com>
Date: Thu, 25 Nov 2021 13:15:13 +0800
Subject: [PATCH] =?UTF-8?q?1125-gaofei-=E9=A6=96=E9=A1=B5=E5=8F=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=85=B3=E9=97=AD=E7=9A=84=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E4=BA=8B=E9=A1=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/common/main.aspx.cs        | 4 ++--
 SGGL/FineUIPro.Web/common/mainProject.aspx.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/common/main.aspx.cs b/SGGL/FineUIPro.Web/common/main.aspx.cs
index fb92f104..f429ac44 100644
--- a/SGGL/FineUIPro.Web/common/main.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main.aspx.cs
@@ -432,9 +432,9 @@ namespace FineUIPro.Web.common
             {
                 var getGJSX = (from x in Funs.DB.GJSX
                                join y in Funs.DB.Base_QuestionType on x.QuestionTypeID equals y.QuestionTypeID
-                               where (y.QuestionTypeName.Contains("紧急") || y.QuestionTypeName.Contains("重要"))
+                               where (y.QuestionTypeName.Contains("紧急") || y.QuestionTypeName.Contains("重要")) && x.State != "0"
                                orderby x.CreateDate
-                               select new { x.GJSXID,x.Detail,x.CreateDate,x.ProjectId,y.QuestionTypeName}).Distinct().Take(20);
+                               select new { x.GJSXID, x.Detail, x.CreateDate, x.ProjectId, y.QuestionTypeName }).Distinct().Take(20);
                 string strNoticeHtml = string.Empty;
                 var readIds = from x in Funs.DB.Sys_UserRead where x.UserId == this.CurrUser.UserId select x.DataId;
                 foreach (var item in getGJSX)
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index 1cf7dc16..972fcd84 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -248,7 +248,7 @@ namespace FineUIPro.Web.common
             {
                 var getGJSX = (from x in Funs.DB.GJSX
                                join y in Funs.DB.Base_QuestionType on x.QuestionTypeID equals y.QuestionTypeID
-                               where x.ProjectId == this.CurrUser.LoginProjectId
+                               where x.ProjectId == this.CurrUser.LoginProjectId && x.State != "0"
                                orderby x.CreateDate
                                select new { x.GJSXID, x.Detail, x.CreateDate, x.ProjectId, y.QuestionTypeName }).Distinct().Take(20);
                 string strNoticeHtml = string.Empty;