From 38e3665144cbabd5d59f876268053e749f046e3a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 09 九月 2025 09:33:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.UserServer.Application/Users/Commands/SyncUserCommandHandler.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Users/Commands/SyncUserCommandHandler.cs b/FlexJobApi.UserServer.Application/Users/Commands/SyncUserCommandHandler.cs
index 1d2aa02..1f4906a 100644
--- a/FlexJobApi.UserServer.Application/Users/Commands/SyncUserCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Users/Commands/SyncUserCommandHandler.cs
@@ -54,9 +54,12 @@
.Where(it => it.SocietyCreditCode == request.Enterprise.SocietyCreditCode)
.FirstOrDefaultAsync(cancellationToken);
+ var add = false;
if (enterprise == null)
{
+ add = true;
enterprise = new Enterprise();
+ enterprise.Id = IDGen.NextID();
if (request.Enterprise.ElectronSignAccesses.IsNotNull())
{
request.Enterprise.ElectronSignAccesses = await repElectronSignSetting.AsQueryable().AsNoTracking()
@@ -70,6 +73,10 @@
ElectronSignAccess = it
})
.ToList();
+ }
+ if (request.Enterprise.EnterpriseAuth == null)
+ {
+ request.Enterprise.EnterpriseAuth = new SyncEnterpriseUserCommandEnterpriseAuth();
}
request.Enterprise.Adapt(enterprise);
enterprise.LicenseImage = GetOssUrl(enterprise.LicenseImage, request.Enterprise.LicenseImage);
@@ -101,11 +108,6 @@
enterprise.EnterpriseAuth.IdentityBackImg = GetOssUrl(enterprise.EnterpriseAuth.IdentityBackImg, request.Enterprise.EnterpriseAuth.IdentityBackImg);
enterprise.EnterpriseAuth.BankCardImg = GetOssUrl(enterprise.EnterpriseAuth.BankCardImg, request.Enterprise.EnterpriseAuth.BankCardImg);
}
-
- if (enterprise.Id == Guid.Empty)
- await repEnterprise.InsertAsync(enterprise);
- else
- await repEnterprise.UpdateAsync(enterprise);
if (enterprise.EnterpriseAuth.ElectronSignEnterpriseId == null)
{
@@ -160,6 +162,11 @@
enterprise.EnterpriseAuth.CertAccount = resultReal.Result.CertAccount;
}
+ if (add)
+ await repEnterprise.InsertNowAsync(enterprise);
+ else
+ await repEnterprise.UpdateNowAsync(enterprise);
+
var user = await repUser.AsQueryable()
.Include(it => it.UserRoles)
.Where(it => it.Type == EnumUserType.Enterprise && it.DataSource == request.DataSource && it.DataSourceId == request.DataSourceId)
--
Gitblit v1.9.1