shecs/Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-11-11 16:10:08 +08:00
parent 2e14c723c8
commit 809c06a3cb
55 changed files with 769 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/common/PageBase.cs
+16 -8
View File
@@ -1510,7 +1510,7 @@ namespace FineUIPro.Web
// MC Auto
if (sends.EmailUserYN == 0)
{
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人：改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@@ -1552,10 +1552,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId==ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)
@@ -1614,7 +1618,7 @@ namespace FineUIPro.Web
string[] mailCC = null;
string resultMessage = "";
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人:改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@@ -1656,10 +1660,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId == ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)