过滤竣工项目

This commit is contained in:
杨家亮 2026-05-12 18:18:22 +08:00
parent 42b6dc4641
commit 364a617b4b
1 changed files with 7 additions and 5 deletions

View File

@ -281,6 +281,7 @@
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
return (from x in Funs.DB.Base_Project
where x.ProjectState == "1"
orderby x.ProjectCode descending
select x).ToList();
}
@ -292,6 +293,7 @@
if (getRoleP != null)
{
return (from x in Funs.DB.Base_Project
where x.ProjectState == "1"
orderby x.ProjectCode descending
select x).ToList();
}
@ -299,7 +301,7 @@
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where y.UserId == userId
where y.UserId == userId && x.ProjectState == "1"
orderby x.ProjectCode descending
select x).Distinct().ToList();
}
@ -313,7 +315,7 @@
{
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
return (from x in Funs.DB.Base_Project
return (from x in Funs.DB.Base_Project where x.ProjectState == "1"
orderby x.ProjectCode descending
select x).ToList();
}
@ -325,7 +327,7 @@
if (getRoleP != null)
{
return (from x in Funs.DB.Base_Project
where x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)
where x.ProjectState == "1" && x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)
orderby x.ProjectCode descending
select x).ToList();
}
@ -333,7 +335,7 @@
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where y.UserId == userId && (x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId))
where y.UserId == userId && (x.ProjectState2 != "7" || (needProjectId != "" && needProjectId == x.ProjectId)) && x.ProjectState == "1"
orderby x.ProjectCode descending
select x).Distinct().ToList();
}