From e538406a8d8288e956d20b2964d8b9691481bd5a Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 4 Aug 2026 10:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8=E6=95=99?=
 =?UTF-8?q?=E8=82=B2=20=E9=99=84=E4=BB=B6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/SEController/SENewUsers.cs            | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
index cb7506c..e4dafe5 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
@@ -60,6 +60,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                     foreach (var item in Nav_Teachers)
                         item.Nav_User = null;
                 }
+
+
+
                 if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
                 {
                     var listCodeCheck = Nav_NewUserDetail.Where(e => !e.IS_DELETED && e.CODE != null && e.CODE.Length > 0).Select(e => e.CODE);
@@ -207,6 +210,49 @@ namespace APT.SC.WebApi.Controllers.Api.SE
                     }
                     finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE061_SHOWPRINT");
                 }
+                else
+                {
+                    var allDepartment = Nav_NewUserDetail.Where(t => t.IS_DELETED == false).Select(t => t.USER_DEPARTMENT_ID);
+                    if (allDepartment == null || allDepartment.Count() < 1)
+                    {
+                        //全部都删除了
+                        entity.IS_DELETED = true;
+                        foreach (var item in Nav_NewUserDetail)
+                        {
+                            item.IS_DELETED = true;
+                        }
+                        foreach (var item in Nav_Teachers)
+                        {
+                            item.IS_DELETED = true;
+                        }
+                        foreach (var item in Nav_Files)
+                        {
+                            item.IS_DELETED = true;
+                        }
+                        foreach (var item in detailFiles)
+                        {
+                            item.IS_DELETED = true;
+                        }
+                    }
+                    else
+                    {
+                        var allUser = GetEntities<T_FM_USER>(t => allDepartment.Contains(t.DEPARTMENT_ID) && t.Nav_ApproveRole != null, new BaseFilter(entity.ORG_ID));
+                        foreach (var item in Nav_NewUserDetail)
+                        {
+                            if (item.IS_DELETED)
+                                continue;
+                            if (item.Nav_Files != null && item.Nav_Files.Count() > 0)
+                            {
+                                item.Nav_Files.ForEach(nf =>
+                                {
+                                    nf.USER_DETAIL_ID = item.ID;
+                                });
+                                detailFiles.AddRange(item.Nav_Files);
+                                item.Nav_Files = null;
+                            }
+                        }
+                    }
+                }
 
                 var deleteD = Nav_NewUserDetail.Where(e => e.IS_DELETED && e.USER_ID.HasValue);
                 List<T_FM_USER> listUserDel = null;