11
This commit is contained in:
@@ -212,6 +212,7 @@
|
||||
{
|
||||
var list = (from x in Funs.DB.Base_Project
|
||||
where x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1
|
||||
where x.ProjectState != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
return list;
|
||||
@@ -254,7 +255,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
var list = (from x in Funs.DB.Base_Project
|
||||
var list = (from x in Funs.DB.Base_Project
|
||||
where x.ProjectState == state
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
@@ -269,7 +270,8 @@
|
||||
public static List<Model.Base_Project> GetAllProjectDropDownList()
|
||||
{
|
||||
var list = (from x in Funs.DB.Base_Project
|
||||
orderby x.ProjectCode descending
|
||||
where x.ProjectState != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
return list;
|
||||
}
|
||||
@@ -283,6 +285,7 @@
|
||||
{
|
||||
var list = (from x in Funs.DB.Base_Project
|
||||
where x.ProjectType == projectType
|
||||
where x.ProjectState != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
return list;
|
||||
@@ -296,7 +299,8 @@
|
||||
{
|
||||
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 != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
}
|
||||
@@ -308,6 +312,7 @@
|
||||
if (getRoleP != null)
|
||||
{
|
||||
return (from x in Funs.DB.Base_Project
|
||||
where x.ProjectState != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).ToList();
|
||||
}
|
||||
@@ -316,6 +321,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 x.ProjectState != "3"
|
||||
orderby x.ProjectCode descending
|
||||
select x).Distinct().ToList();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user