From e688f6ec45966c1d1844e93c85291f44246c5f7d Mon Sep 17 00:00:00 2001
From: 10191 <506754232@qq.com>
Date: Mon, 20 Feb 2023 16:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=BD=95=E5=85=A5=E7=9A=84=E8=A3=85=E7=BD=AE/?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=20=20=E5=81=9A=E4=B8=80=E4=B8=AA=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=A3=85=E7=BD=AE=E6=8F=90=E7=A4=BA=E6=9C=89=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=B7=A5=E5=8C=BA=E3=80=81=E5=8D=95=E4=BD=8D=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=A6=82=E6=9E=9C=E6=8C=82=E7=9D=80=E5=B0=B1=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=80=E4=B8=8B=20=E6=9C=AC=E9=83=A8=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=20=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=8D=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ProjectData/Installation.aspx.cs |  8 ++++++++
 SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx      |  2 +-
 SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs   | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

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 @@
                 </f:FormRow>
                 <f:FormRow runat="server" ID="trServer">
                     <Items>                      
-                        <f:DropDownList ID="drpDepart" runat="server" Label="部门" ShowRedStar="true" Required="true"
+                        <f:DropDownList ID="drpDepart" runat="server" Label="部门"  
                             EnableEdit="true" ForceSelection="false" LabelWidth="90px">
                         </f:DropDownList>
                         <f:DropDownList ID="drpIsOffice" runat="server" Label="本部人员"  
diff --git a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
index 93e9723d..81b93aef 100644
--- a/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
@@ -163,11 +163,11 @@ namespace FineUIPro.Web.SysManage
                 Alert.ShowInParent("请选择单位！", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.drpDepart.SelectedValue == Const._Null && !this.trServer.Hidden)
-            {
-                Alert.ShowInParent("请选择部门！", MessageBoxIcon.Warning);
-                return;
-            }
+            //if (this.drpDepart.SelectedValue == Const._Null && !this.trServer.Hidden)
+            //{
+            //    Alert.ShowInParent("请选择部门！", MessageBoxIcon.Warning);
+            //    return;
+            //}
             var q = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == this.txtAccount.Text.Trim() && (x.UserId != this.UserId || (this.UserId == null && x.UserId != null)));
             if (q != null)
             {