From 0a94a4385899cd672a72473ecdf665d9632d3a34 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 17:30:58 +0800
Subject: [PATCH] 111

---
 MES.Service/service/BasicData/OrganizeManager.cs |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index a9b7cc8..2add687 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -23,14 +23,11 @@
                     if (UpdateOrganizetatus(db, entity.FNumber, "B"))
                         return 1;
                     break;
-                case "2":
-                    if (InsertItem(db, entity))
-                        return 1;
-                    break;
                 case "3":
                     if (DeleteItem(db, entity.FNumber))
                         return 1;
                     break;
+                case "2":
                 case "4":
                     if (InsertOrUpdate(db, entity))
                         return 1;
@@ -63,14 +60,11 @@
                         if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
                             throw new NotImplementedException("绂佺敤澶辫触");
                         break;
-                    case "2":
-                        if (!InsertItemBatch(db, itemGroup.Value))
-                            throw new NotImplementedException("鎻掑叆澶辫触");
-                        break;
                     case "3":
                         if (!DeleteItemBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍒犻櫎澶辫触");
                         break;
+                    case "2":
                     case "4":
                         if (!InsertOrUpdateBatch(db, itemGroup.Value))
                             throw new NotImplementedException("鍚屾澶辫触");
@@ -123,7 +117,8 @@
             Name = organize.FName,
             FNumber = organize.FNumber,
             FParentlD = organize.FParentID,
-            IsStatus = organize.FForbidStatus.Equals("A")
+            IsStatus = organize.FForbidStatus.Equals("A"),
+            Factory = organize.Id,
         };
     }
 
@@ -176,10 +171,6 @@
     private bool InsertOrUpdateBatch(SqlSugarScope db,
         List<SysOrganization> itemList)
     {
-        foreach (var entity in itemList)
-            if (!InsertOrUpdate(db, entity))
-                return false;
-
-        return true;
+        return itemList.All(entity => InsertOrUpdate(db, entity));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3