安全不符合项清单
This commit is contained in:
@@ -202,6 +202,7 @@
|
||||
select x).ToList();
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目属性下拉框
|
||||
/// </summary>
|
||||
@@ -458,6 +459,31 @@
|
||||
}
|
||||
|
||||
#region 项目表下拉框
|
||||
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitProjectDropDownList(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
|
||||
{
|
||||
var IsThisUnit = CommonService.GetThisUnitId() == unitId ? true : false;
|
||||
dropName.DataValueField = "ProjectId";
|
||||
dropName.DataTextField = "ProjectName";
|
||||
if (IsThisUnit)
|
||||
{
|
||||
dropName.DataSource = GetProjectWorkList();
|
||||
}
|
||||
else
|
||||
{
|
||||
dropName.DataSource =GetProjectWorkList(unitId);
|
||||
}
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 项目表下拉框
|
||||
/// </summary>
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
public static class ProjectUserService
|
||||
{
|
||||
public static CNPCDB db = Funs.DB;
|
||||
|
||||
/// <summary>
|
||||
///获取项目用户信息
|
||||
/// </summary>
|
||||
@@ -59,8 +57,8 @@
|
||||
UnitId = projectUser.UnitId,
|
||||
RoleId = projectUser.RoleId,
|
||||
IsPost = projectUser.IsPost,
|
||||
MainCNProfessionalId=projectUser.MainCNProfessionalId,
|
||||
ViceCNProfessionalId=projectUser.ViceCNProfessionalId
|
||||
MainCNProfessionalId = projectUser.MainCNProfessionalId,
|
||||
ViceCNProfessionalId = projectUser.ViceCNProfessionalId
|
||||
};
|
||||
//newProjectUser.RoleName = projectUser.RoleName;
|
||||
db.Project_ProjectUser.InsertOnSubmit(newProjectUser);
|
||||
@@ -154,7 +152,7 @@
|
||||
|
||||
public static List<Sys_User> GetProjectUserByUnitidAndProjectId(string ProjectId, string UnitId, string RoleId)
|
||||
{
|
||||
var ids = Funs.DB.Project_ProjectUser.Where(e => e.ProjectId == ProjectId &&( UnitId==""|| e.UnitId == UnitId)&&(RoleId==""||e.RoleId.Contains(RoleId)) ).Select(u => u.UserId).ToList();
|
||||
var ids = Funs.DB.Project_ProjectUser.Where(e => e.ProjectId == ProjectId && (UnitId == "" || e.UnitId == UnitId) && (RoleId == "" || e.RoleId.Contains(RoleId))).Select(u => u.UserId).ToList();
|
||||
return Funs.DB.Sys_User.Where(u => ids.Contains(u.UserId)).ToList();
|
||||
}
|
||||
|
||||
@@ -170,5 +168,28 @@
|
||||
where x.ProjectId == ProjectId && y.IdentityCard == IdentityCard
|
||||
select x).FirstOrDefault();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据项目Id获取项目所有在岗用户
|
||||
/// </summary>
|
||||
/// <param name="ProjectId"></param>
|
||||
/// <param name="UnitId"></param>
|
||||
/// <param name="RoleId"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Sys_User> GetProjectUserByProjectId(string ProjectId, string UnitId, string RoleId)
|
||||
{
|
||||
var pUsers = Funs.DB.Project_ProjectUser.Where(e => e.ProjectId == ProjectId && e.IsPost == true).ToList();
|
||||
if (!string.IsNullOrWhiteSpace(UnitId))
|
||||
{
|
||||
pUsers = pUsers.Where(x => x.UnitId == UnitId).ToList();
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(RoleId))
|
||||
{
|
||||
pUsers = pUsers.Where(x => x.RoleId == RoleId).ToList();
|
||||
}
|
||||
var ids = pUsers.Select(u => u.UserId).ToList();
|
||||
return Funs.DB.Sys_User.Where(u => ids.Contains(u.UserId)).ToList();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user