diff --git a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs index 05b41163..7d206f3e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs @@ -8,6 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; using Newtonsoft.Json.Linq; +using Model; namespace FineUIPro.Web.ProjectData { @@ -382,6 +383,13 @@ namespace FineUIPro.Web.ProjectData BLL.WbsDetailService.DeleteWbsDetailByToWbs(wbsSet.WbsSetId); //删除进度记录 BLL.WbsSetService.DeleteWbsSet(wbsSet.WbsSetId); } + var unitWorks = (from x in Funs.DB.WBS_UnitWork where x.InstallationId == installationId select x).ToList(); + foreach (var unitWork in unitWorks) + { + BLL.BreakdownProjectService.DeleteAllBreakdownByUnitWorkId(unitWork.UnitWorkId); + BLL.DivisionProjectService.DeleteDivisionProjectByUnitWorkId(unitWork.UnitWorkId); + BLL.UnitWorkService.DeleteUnitWorkById(unitWork.UnitWorkId); + } //删除单位工程及子单位工程 var unitProjects = from x in Funs.DB.Wbs_UnitProject join y in Funs.DB.WBS_CnProfession on x.CnProfessionId equals y.CnProfessionId where y.InstallationId == installationId && x.CnProfessionId != null select x; diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx index 4a2dc52e..edc8041a 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx @@ -38,7 +38,7 @@ - x.Account == this.txtAccount.Text.Trim() && (x.UserId != this.UserId || (this.UserId == null && x.UserId != null))); if (q != null) {