From 364a617b4bb5026f0ebe2f5c126c3876bf022a9e Mon Sep 17 00:00:00 2001
From: Zones <765289303@qq.com>
Date: Tue, 12 May 2026 18:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=AB=A3=E5=B7=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/ProjectData/ProjectService.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index 26b5dbd..397f7d0 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -280,7 +280,8 @@
         {
             if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
             {
-                return (from x in Funs.DB.Base_Project
+                return (from x in Funs.DB.Base_Project 
+                        where x.ProjectState == "1"
                         orderby x.ProjectCode descending
                         select x).ToList();
             }
@@ -292,6 +293,7 @@
                 if (getRoleP != null)
                 {
                     return (from x in Funs.DB.Base_Project
+                            where x.ProjectState == "1"
                             orderby x.ProjectCode descending
                             select x).ToList();
                 }
@@ -299,7 +301,7 @@
                 {
                     return (from x in Funs.DB.Base_Project
                             join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
-                            where y.UserId == userId
+                            where y.UserId == userId && x.ProjectState == "1"
                             orderby x.ProjectCode descending
                             select x).Distinct().ToList();
                 }
@@ -313,7 +315,7 @@
         {
             if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
             {
-                return (from x in Funs.DB.Base_Project
+                return (from x in Funs.DB.Base_Project where x.ProjectState == "1"
                         orderby x.ProjectCode descending
                         select x).ToList();
             }
@@ -325,7 +327,7 @@
                 if (getRoleP != null)
                 {
                     return (from x in Funs.DB.Base_Project
-                            where x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)
+                            where x.ProjectState == "1" && x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)
                             orderby x.ProjectCode descending
                             select x).ToList();
                 }
@@ -333,7 +335,7 @@
                 {
                     return (from x in Funs.DB.Base_Project
                             join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
-                            where y.UserId == userId && (x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId))
+                            where y.UserId == userId && (x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)) && x.ProjectState == "1"
                             orderby x.ProjectCode descending
                             select x).Distinct().ToList();
                 }