diff --git a/DataBase/版本日志/SUBQHSE_V2025-10-21-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2025-10-21-xiaj.sql new file mode 100644 index 00000000..a517450c --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-10-21-xiaj.sql @@ -0,0 +1,7 @@ + + + +ALTER TABLE DriverGoods_GoodsModel +ALTER COLUMN Description NVARCHAR(500); + + diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index 6ea018f1..a71e1cbd 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -608,8 +608,8 @@ namespace BLL #region 事项逾期提醒项目主管和项目经理 - var projectSupervisors = ProjectUserService.GetProjectUserByRoleId(Const.ProjectSupervisor); - var projectManagers = ProjectUserService.GetProjectUserByRoleId(Const.ProjectManager); + var projectSupervisors = ProjectUserService.GetProjectUserByRoleId(pro.ProjectId,Const.ProjectSupervisor); + var projectManagers = ProjectUserService.GetProjectUserByRoleId(pro.ProjectId, Const.ProjectManager); List remindUserIds = new List(); List projectSupervisorIds = projectSupervisors.Select(x => x.UserId).ToList(); diff --git a/SGGL/BLL/ProjectData/ProjectUserService.cs b/SGGL/BLL/ProjectData/ProjectUserService.cs index c153853c..33e68440 100644 --- a/SGGL/BLL/ProjectData/ProjectUserService.cs +++ b/SGGL/BLL/ProjectData/ProjectUserService.cs @@ -2,6 +2,7 @@ { using System.Collections.Generic; using System.Linq; + using System.Web.Security; using Model; public static class ProjectUserService @@ -39,9 +40,9 @@ ///获取项目用户信息 根据用户角色ID /// /// - public static List GetProjectUserByRoleId(string roleId) + public static List GetProjectUserByRoleId(string projectId, string roleId) { - return (from x in Funs.DB.Project_ProjectUser where x.RoleId.Contains(roleId) select x).ToList(); + return (from x in Funs.DB.Project_ProjectUser where x.ProjectId == projectId && x.RoleId.Contains(roleId) select x).ToList(); } ///