From 8701bd8c4475fc140f50b9915e94d3fd835a1f65 Mon Sep 17 00:00:00 2001
From: tengyufan <1532636164@qq.com>
Date: Wed, 19 Aug 2026 10:16:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(ClientBlack):=20=E4=BF=AE=E6=AD=A3=E9=BB=91?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=88=A0=E9=99=A4=E7=BB=93=E6=9E=9C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根据本次实际进入删除审批的记录数返回删除结果
- 未提交、新增已拒绝直接删除时提示“删除成功”
- 已生效记录进入删除审批时提示“已经提交删除审批”
- 批量混合删除时提示部分记录已提交删除审批
---
 YLErpDAL/Modules/ClientModule/ClientBlackService.cs | 5 ++++-
 YLErpWeb/Controllers/clientblackController.cs       | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/YLErpDAL/Modules/ClientModule/ClientBlackService.cs b/YLErpDAL/Modules/ClientModule/ClientBlackService.cs
index d4c4d709..c5ef8b49 100644
--- a/YLErpDAL/Modules/ClientModule/ClientBlackService.cs
+++ b/YLErpDAL/Modules/ClientModule/ClientBlackService.cs
@@ -114,7 +114,7 @@ namespace YLErp.Modules.ClientModule
                 .ToList();
         }
 
-        public void DeleteClientBlack(IEnumerable<int> ids)
+        public int DeleteClientBlack(IEnumerable<int> ids)
         {
             var idList = ids?.Distinct().ToList() ?? new List<int>();
             if (idList.Count == 0)
@@ -129,6 +129,7 @@ namespace YLErp.Modules.ClientModule
             }
 
             var hasProcess = ProcessList().Any();
+            var submitRemovalApprovalCount = 0;
             foreach (var row in rows)
             {
                 if (ClientBlackApprovalPolicy.CanDeleteDraft(row.State))
@@ -151,6 +152,7 @@ namespace YLErp.Modules.ClientModule
                     row.ApprovalOptName = UserName;
                     row.ApprovalOptDate = DateTime.Now;
                     ClientBlackCategoryLog(row.id, client_black.删除审批中);
+                    submitRemovalApprovalCount++;
                 }
                 else
                 {
@@ -159,6 +161,7 @@ namespace YLErp.Modules.ClientModule
             }
 
             DbContext.SaveChanges();
+            return submitRemovalApprovalCount;
         }
 
         public void WithdrawApprovalClientBlack(List<int> ids, out int withdrawCount, out string msg)
diff --git a/YLErpWeb/Controllers/clientblackController.cs b/YLErpWeb/Controllers/clientblackController.cs
index 9fe1d7ae..923c29ef 100644
--- a/YLErpWeb/Controllers/clientblackController.cs
+++ b/YLErpWeb/Controllers/clientblackController.cs
@@ -72,8 +72,13 @@ namespace YLErp.Web.Controllers
             {
                 var datalist = ids.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToList();
                 var service = new ClientBlackService(CurUser);
-                service.DeleteClientBlack(datalist);
-                return JsonSuccess(service.ProcessList().Any() ? "已经提交删除审批！" : "删除成功");
+                var submitRemovalApprovalCount = service.DeleteClientBlack(datalist);
+                var message = submitRemovalApprovalCount == 0
+                    ? "删除成功"
+                    : submitRemovalApprovalCount == datalist.Count
+                        ? "已经提交删除审批！"
+                        : "删除成功，部分记录已提交删除审批！";
+                return JsonSuccess(message);
             }
             catch (Exception ex)
             {