diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
index 0dad4d0..9e6399a 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
@@ -409,7 +409,9 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         updateTeamInfo = teamInfo;
                     }
                 }
-                
+                //判断组织下是否有人
+                bool haveUser = false;
+                string message = "";
                 //List<T_FM_DEPARTMENT_PRODUCTION_UNIT> productionUnit = null;
                 entity.Nav_ProdutionUnit = null;
                 //if (productionUnit != null && productionUnit.Any())
@@ -445,7 +447,17 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         t.IS_DELETED = entity.IS_DELETED;
                         t.MineType = entity.MineType;
                         t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
+                        if (entity.ENABLE_STATUS == 1)
+                        {
+                            t.IS_DELETED = true;
+                        }
                         departUpdateList.Add(t);
+                        var userFirst= userList.FirstOrDefault(m => m.DEPARTMENT_ID == t.ID);
+                        if (userFirst != null && entity.ENABLE_STATUS == 1)
+                        {
+                            haveUser = true;
+                            message = "当前组织的下级组织存在人员，请先到用户列表修改对应组织";
+                        }
                         T_FM_DEPARTMENT_PRODUCTION_UNIT unit = new T_FM_DEPARTMENT_PRODUCTION_UNIT();
                         unit.ORG_ID = t.ORG_ID; unit.DEPARTMENT_ID = t.ID; //unit.ENUMS_ID = enumList?.ID;
                         unit.Nav_Enums = null; unit.DEPART_UNIT_ID = entity.PRODUCTION_UNIT_ID;
@@ -491,9 +503,24 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                     if (updateTeamInfo != null)
                         updateTeamInfo.CHARGE_PERSON_ID = user.PERSON_ID;
                 }
+                if (entity.CATEGORY == FMCATEGORY.VIRTUAL)
+                {
+                    var userFirst = userList.FirstOrDefault(t => t.DEPARTMENT_ID == entity.ID);
+                    if (userFirst != null)
+                    {
+                        haveUser = true;
+                        message = "当前组织存在人员，不可配置虚拟组织，请先到用户列表修改人员组织";
+                    }
+                }
                 if (entity.ENABLE_STATUS == 1)
                 {
                     entity.IS_DELETED = true;
+                    var userFirst = userList.FirstOrDefault(t => t.DEPARTMENT_ID == entity.ID);
+                    if (userFirst != null)
+                    {
+                        haveUser = true;
+                        message = "当前组织存在人员，请先到用户列表修改对应组织";
+                    }
                     if (updateTeamInfo != null)
                     {
                         updateTeamInfo.ENABLE_STATUS = 1;
@@ -510,6 +537,10 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                 {
                     item.Nav_User = null; item.Nav_ProdutionUnit = null; item.Nav_Unit = null; item.Nav_Parent = null;item.Nav_DepartmentUser = null;
                 }
+                if (haveUser)
+                {
+                    throw new Exception(message);
+                }
                 this.UnifiedCommit(() =>
                 {
                     //BantchUpdateEntity_noneBase