From 66d458026e486d73062e7cef098e66ddbda5e5cf Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Mon, 21 Oct 2024 14:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=BD=E5=B7=A5=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Common/Const.cs | 5 +++++ .../CQMS/Solution/EditConstructSolution.aspx.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 95011b8e..395393e0 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -6120,5 +6120,10 @@ namespace BLL /// 中央企业安全生产管理评价工作调度台账上报 /// public const string ReportType_12 = "12"; + + /// + /// 施工工程师（总包） + /// + public const string SGEngineer = "F7302DA3-B522-43F9-98CC-6317622A884E"; } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index 52db72f6..97f6e90e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -1543,7 +1543,8 @@ namespace FineUIPro.Web.CQMS.Solution on x.UnitId equals y.UnitId join p in Funs.DB.Project_ProjectUser on x.UserId equals p.UserId - where (p.RoleId.Contains(Const.ZBCNEngineer)|| p.RoleId.Contains(Const.HSSEEngineer)) + where (p.RoleId.Contains(Const.ZBCNEngineer)|| p.RoleId.Contains(Const.HSSEEngineer) + || p.RoleId.Contains(Const.SGEngineer)) && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId select x);