From cdb8ca3f97ded53176a7b5a967932335ea0ac6e1 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 23 十月 2024 16:26:02 +0800
Subject: [PATCH] 1
---
MES.Service/service/BasicData/SysDepartmentManager.cs | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 764532e..bc88536 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -76,8 +75,8 @@
// 鍒犻櫎閮ㄩ棬鐨勬柟娉�
private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
{
- var deleteById = db.Deleteable<SysDepartment>().In(departmentId)
- .ExecuteCommand();
+ var deleteById = db.Deleteable<SysDepartment>()
+ .Where(s => s.Id == departmentId).ExecuteCommand();
if (deleteById > 0)
return true;
@@ -88,21 +87,11 @@
private bool InsertOrUpdateDepartment(SqlSugarScope db,
SysDepartment entity)
{
- var exists = db.Queryable<SysDepartment>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
+ db.Deleteable<SysDepartment>()
+ .Where(s => s.Id == entity.Id).ExecuteCommand();
- return false;
+ var insert = db.Insertable(entity).ExecuteCommand();
+ return insert > 0;
}
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
@@ -213,7 +202,9 @@
{
var ids = departmentList.Select(it => it.Id).ToArray();
var deleteByIds =
- db.Deleteable<SysDepartment>().In(ids).ExecuteCommand();
+ db.Deleteable<SysDepartment>()
+ .Where(s => ids.Contains(s.Id)).ExecuteCommand();
+
if (deleteByIds > 0)
return true;
@@ -224,10 +215,7 @@
private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
List<SysDepartment> departmentList)
{
- foreach (var entity in departmentList)
- if (!InsertOrUpdateDepartment(db, entity))
- return false;
-
- return true;
+ return departmentList.All(
+ entity => InsertOrUpdateDepartment(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3