From 1c756418a256d2db1ad3f6bd3f3e3e52d08b440d Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 13 Aug 2024 16:09:47 +0800 Subject: [PATCH] =?UTF-8?q?20240813=20=E5=8D=95=E4=BD=8D=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs | 6 +++++- SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs index f42c8ccd..25a462a5 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs @@ -87,7 +87,11 @@ namespace FineUIPro.Web.CQMS.WBS this.trWBS.AutoScroll = true; this.trWBS.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && (x.SuperUnitWork == null || x.SuperUnitWork == "0") + orderby x.UnitWorkCode + select x; foreach (var q in unitWorks) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs index 4e41f1f6..e64a4fc5 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs @@ -79,7 +79,11 @@ namespace FineUIPro.Web.CQMS.WBS this.trWBS.EnableIcons = true; this.trWBS.AutoScroll = true; this.trWBS.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork + where x.ProjectId == this.CurrUser.LoginProjectId + && (x.SuperUnitWork == null || x.SuperUnitWork == "0") + orderby x.UnitWorkCode + select x; foreach (var q in unitWorks) { TreeNode newNode = new TreeNode();