From 80f7f4e4bed46064b44ea12fadf650cb7edb97ee Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:58:47 +0800
Subject: [PATCH] 修复报错
---
Service/HStation.Service.Xhs.Core/04-dal/03-sqlite/XhsProject.cs | 81 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/Service/HStation.Service.Xhs.Core/04-dal/03-sqlite/XhsProject.cs b/Service/HStation.Service.Xhs.Core/04-dal/03-sqlite/XhsProject.cs
index 1177482..a508240 100644
--- a/Service/HStation.Service.Xhs.Core/04-dal/03-sqlite/XhsProject.cs
+++ b/Service/HStation.Service.Xhs.Core/04-dal/03-sqlite/XhsProject.cs
@@ -18,9 +18,9 @@
/// <summary>
/// 鎻掑叆鎷撳睍
/// </summary>
- public long InsertEx(Entity.XhsProject project, Entity.XhsProjectSite site)
+ public long InsertEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null)
+ if (entityProject == null)
{
return default;
}
@@ -29,10 +29,10 @@
try
{
db.BeginTran();
- if (project.ID < 1)
+ if (entityProject.ID < 1)
{
- project.ID = db.Insertable(project).ExecuteReturnSnowflakeId();
- if (project.ID < 1)
+ entityProject.ID = db.Insertable(entityProject).ExecuteReturnSnowflakeId();
+ if (entityProject.ID < 1)
{
db.RollbackTran();
return default;
@@ -40,7 +40,7 @@
}
else
{
- var bol = db.Insertable(project).ExecuteCommand() > 0;
+ var bol = db.Insertable(entityProject).ExecuteCommand() > 0;
if (!bol)
{
db.RollbackTran();
@@ -48,30 +48,33 @@
}
}
- if (site != null)
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
{
- site.ProjectID = project.ID;
- if (site.ID < 1)
+ foreach (var entityProjectSite in entityProjectSiteList)
{
- site.ID = db.Insertable(site).ExecuteReturnSnowflakeId();
- if (site.ID < 1)
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
{
- db.RollbackTran();
- return default;
+ entityProjectSite.ID = db.Insertable(entityProjectSite).ExecuteReturnSnowflakeId();
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return default;
+ }
}
- }
- else
- {
- var bol = db.Insertable(site).ExecuteCommand() >= 0;
- if (!bol)
+ else
{
- db.RollbackTran();
- return default;
+ var bol = db.Insertable(entityProjectSite).ExecuteCommand() >= 0;
+ if (!bol)
+ {
+ db.RollbackTran();
+ return default;
+ }
}
}
}
-
- return project.ID;
+ db.CommitTran();
+ return entityProject.ID;
}
catch
{
@@ -84,13 +87,13 @@
/// <summary>
/// 缂栬緫鎷撳睍
/// </summary>
- public bool UpdateEx(Entity.XhsProject project, Entity.XhsProjectSite site)
+ public bool UpdateEx(Entity.XhsProject entityProject, List<Entity.XhsProjectSite> entityProjectSiteList)
{
- if (project == null)
+ if (entityProject == null)
{
return false;
}
- if (project.ID < 1)
+ if (entityProject.ID < 1)
{
return false;
}
@@ -99,27 +102,31 @@
try
{
db.BeginTran();
- var bol = db.Updateable(project).ExecuteCommandHasChange();
+ var bol = db.Updateable(entityProject).ExecuteCommandHasChange();
if (!bol)
{
db.RollbackTran();
return false;
}
- if (site != null)
+ if (entityProjectSiteList != null && entityProjectSiteList.Count > 0)
{
- site.ProjectID = project.ID;
- if (site.ID < 1)
+ foreach (var entityProjectSite in entityProjectSiteList)
{
- db.RollbackTran();
- return false;
- }
- bol = db.Updateable(site).ExecuteCommandHasChange();
- if (!bol)
- {
- db.RollbackTran();
- return false;
+ entityProjectSite.ProjectID = entityProject.ID;
+ if (entityProjectSite.ID < 1)
+ {
+ db.RollbackTran();
+ return false;
+ }
+ bol = db.Updateable(entityProjectSite).ExecuteCommandHasChange();
+ if (!bol)
+ {
+ db.RollbackTran();
+ return false;
+ }
}
}
+ db.CommitTran();
return true;
}
catch
--
Gitblit v1.9.3