diff --git a/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs b/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs index e3c4ca3..bc6949e 100644 --- a/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs +++ b/SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs @@ -22,7 +22,7 @@ namespace BLL { var userModel = UserService.GetUserByUserId(userid); int unitType = CommonService.GetUnitTypeByUserId(userid); - var projectList = ProjectService.GetProjectWorkList().Select(x => new { x.ProjectId, x.UnitId }).ToList(); + var projectList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => new { x.ProjectId, x.UnitId }).ToList(); _unitId = userModel.UnitId; _unitType = unitType; if (unitType == 0) diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj index b86f715..ec45f5b 100644 --- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj @@ -10490,7 +10490,7 @@ Fastreport.aspx - ASPXCodeBehind + Component Fastreport.aspx