From ad1aeb59db293e459695b131323fd0caa58e7be1 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 08 五月 2025 18:59:34 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

---
 StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs
index a131eed..cd4ba3f 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs
@@ -36,7 +36,6 @@
                         return 1;
                     break;
                 case "2":
-                case "4":
                     if (InsertOrUpdateDepartment(db, entity)) // 鎻掑叆鎴栨洿鏂伴儴闂�
                         return 1;
                     break;
@@ -148,7 +147,8 @@
             ParentId = Convert.ToDecimal(department.FParentID),
             FDOCUMENTSTATUS = department.FDocumentStatus,
             Company = "1000",
-            Factory = "1000"
+            Factory = "1000",
+            Type=department.Type,
         };
     }
 
@@ -192,7 +192,6 @@
                             throw new NotImplementedException("鍒犻櫎澶辫触");
                         break;
                     case "2":
-                    case "4":
                         if (!InsertOrUpdateDepartmentBatch(db,
                                 departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂�
                             throw new NotImplementedException("鍚屾澶辫触");

--
Gitblit v1.9.3