From 4f0cb973a7db26a9e65247033a95d9a8b3380d4b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 17:26:37 +0800
Subject: [PATCH] 基础信息和采购订单接口更新

---
 MES.Service/service/BasicData/MesStaffManager.cs |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 25fb3a1..e1d0ea8 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -27,7 +27,6 @@
                     break;
                 case "2":
                 case "4":
-                    DeleteStaff(db, sysUser, entity.Id);
                     if (InsertOrUpdateStaff(db, sysUser, entity)) // 鎻掑叆鎴栨洿鏂板憳宸�
                         return 1;
                     break;
@@ -62,6 +61,12 @@
     private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
         MesStaff entity)
     {
+        db.Deleteable<SysUser>()
+            .Where(s => s.Account == sysUser.Account).ExecuteCommand();
+
+        db.Deleteable<MesStaff>()
+            .Where(s => s.Id == entity.Id).ExecuteCommand();
+
         var insertUser = db.Insertable(sysUser).ExecuteCommand();
         if (insertUser <= 0) return false;
         var insertStaff = db.Insertable(entity).ExecuteCommand();
@@ -231,12 +236,6 @@
     private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
         List<MesStaff> staffList)
     {
-        foreach (var sysUser in userList)
-        {
-            var entity = staffList.First(s => s.StaffNo == sysUser.Account);
-            if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
-        }
-
-        return true;
+        return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any();
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3