From ecd013d264abbe773454ca04e1df54c9c0921195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 6 May 2026 14:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/DepartmentController.cs   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
index 4ec3569..0835ba5 100644
--- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
+++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentController.cs
@@ -428,10 +428,10 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                 var userList = new List<T_FM_USER>();
                 var deleteDepartIds = new List<Guid>();
                 var deleteUserIds = new List<Guid>();
-                if (entity.MineType != null)
+                if (entity.PRODUCTION_UNIT_ID != null)
                 {
                     //var enumIds = productionUnit.Select(t => t.ENUMS_ID).Distinct().ToList();
-                    var enumList = this.GetEntity<T_FM_ENUMS>(t => t.CODE == "BSMineTypeEnum" && t.VALUE == entity.MineType);
+                    //var enumList = this.GetEntity<T_FM_ENUMS>(t => t.CODE == "BSMineTypeEnum" && t.VALUE == entity.MineType);
                     //查所有下级部门组织
                     List<Guid> departmentId = new List<Guid>();
                     departmentId.Add(entity.ID);
@@ -444,7 +444,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         t.MineType = entity.MineType;
                         t.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
                         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.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;
                         unitList.Add(unit);
                         if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
@@ -468,9 +468,8 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         //    enumValues.Add(value);
                         //});
                         //t.MineType = string.Join(",", enumValues);
-                        t.MineType = entity.MineType.ToString();
                         T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
-                        unit.ORG_ID = t.ORG_ID; unit.USER_ID = t.ID; unit.ENUMS_ID = enumList?.ID;
+                        unit.ORG_ID = t.ORG_ID; unit.USER_ID = t.ID; //unit.ENUMS_ID = enumList?.ID;
                         unit.Nav_Enums = null; unit.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
                         userUnitList.Add(unit);
                         if (t.Nav_ProdutionUnit != null && t.Nav_ProdutionUnit.Any())
@@ -480,8 +479,22 @@ namespace APT.FM.WebApi.Controllers.Api.FM
                         }
                     });
                 }
+                if (entity.ENABLE_STATUS == 1)
+                {
+                    entity.IS_DELETED = true;
+                    if (teamInfo != null)
+                    {
+                        teamInfo.ENABLE_STATUS = 1;
+                        teamInfo.IS_DELETED = true;
+                    }
+                    foreach (var item in unitList.Where(m => m.DEPARTMENT_ID == entity.ID))
+                    {
+                        item.IS_DELETED = true;
+                    }
+                }
                 this.UnifiedCommit(() =>
                 {
+                    //BantchUpdateEntity_noneBase
                     //if (safeUser != null && safeUser.Any())
                     //    this.BantchSaveEntityNoCommit(safeUser);
                     if (teamInfo != null)