XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-01-09 11:01:28 +08:00
parent 54cdd14889 01c253952b
commit 1eaa56bb2a
3 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/Common/MailService.cs
View File

@ -587,15 +587,12 @@ namespace IRaCIS.Core.Application.Service
saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(IdentityUser));
saveItem.UserName = saveItem.UserCode;
saveItem.UserRoleList = new List<UserRole>() { new UserRole() { DoctorId = doctorId, UserTypeEnum = UserTypeEnum.IndependentReviewer, UserTypeId = userType.Id } };
var savedUser = await _identityUserRepository.AddAsync(saveItem);
//下面获取Token 需要这部分信息
sysUserInfo = savedUser.Clone();
sysUserInfo = savedUser;

3
IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
View File

@ -484,8 +484,9 @@ namespace IRaCIS.Core.Application.Service
}
catch (Exception)
catch (Exception ex)
{
Console.WriteLine(ex.Message);
intoGroupItem.EnrollStatus = EnrollStatus.ConfirmIntoGroupFailed;
}

52
IRaCIS.Core.Infra.EFCore/Context/Convention/NoForeignKeyMigrationsSqlGenerator.cs
View File

@ -35,18 +35,48 @@ public class NoForeignKeyMigrationsSqlGenerator : SqlServerMigrationsSqlGenerato
// 不调用 base.Generate 来跳过生成删除外键的SQL
}
////忽略掉唯一约束
//protected override void Generate(CreateIndexOperation operation, IModel? model, MigrationCommandListBuilder builder, bool terminate = true)
//{
// // 如果索引是唯一的，则忽略，不生成SQL语句
// if (operation.IsUnique)
// {
// return; // 跳过唯一约束的索引创建
// }
//忽略掉唯一约束
protected override void Generate(CreateIndexOperation operation, IModel? model, MigrationCommandListBuilder builder, bool terminate = true)
{
//// 如果索引是唯一的，则忽略，不生成SQL语句
//if (operation.IsUnique)
//{
// return; // 跳过唯一约束的索引创建
//}
// // 如果不是唯一索引，则继续生成
// base.Generate(operation, model, builder, terminate);
//}
//// 如果不是唯一索引，则继续生成
//base.Generate(operation, model, builder, terminate);
//// 获取表信息
//var table = model?.FindEntityType(operation.Table);
//if (table != null)
//{
// // 跳过主键相关的索引（主键索引以主键列构建）
// var primaryKey = table.FindPrimaryKey();
// if (primaryKey != null && operation.Columns.SequenceEqual(primaryKey.Properties.Select(p => p.Name)))
// {
// base.Generate(operation, model, builder, terminate);
// return; // 生成主键相关的索引
// }
//}
// 检查是否是外键索引
var table = model?.FindEntityType(operation.Table);
if (table != null)
{
foreach (var foreignKey in table.GetForeignKeys())
{
// 如果索引列和外键列相同，跳过生成
if (operation.Columns.SequenceEqual(foreignKey.Properties.Select(p => p.Name)))
{
return; // 跳过生成外键索引
}
}
}
// 非外键索引，调用基类方法正常生成
base.Generate(operation, model, builder, terminate);
}