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
continuous-integration/drone/push Build is passing
Details
commit
3c1cc92e1b
|
@ -150,12 +150,12 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
|
||||||
|
|
||||||
RealName = identityUser.FullName,
|
RealName = identityUser.FullName,
|
||||||
UserName = identityUser.UserName,
|
UserName = identityUser.UserName,
|
||||||
|
IsNeedSendEmial= identityUser.IsZhiZhun || (!identityUser.IsZhiZhun&& sysDoc.DocUserSignType== DocUserSignType.InnerAndOuter),
|
||||||
|
|
||||||
|
|
||||||
FullFilePath = sysDoc.Path
|
FullFilePath = sysDoc.Path
|
||||||
};
|
};
|
||||||
var datalist = await systemDocQuery.IgnoreQueryFilters().ToListAsync();
|
var datalist = await systemDocQuery.IgnoreQueryFilters().Where(x=>x.IsNeedSendEmial).ToListAsync();
|
||||||
|
|
||||||
var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
|
var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
|
||||||
var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
|
var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
|
||||||
|
|
|
@ -93,6 +93,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
public class UnionDocumentWithConfirmInfoView : UnionDocumentView
|
public class UnionDocumentWithConfirmInfoView : UnionDocumentView
|
||||||
{
|
{
|
||||||
|
|
||||||
|
public bool IsNeedSendEmial { get; set; }
|
||||||
public DateTime UserCreateTime { get; set; }
|
public DateTime UserCreateTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -176,6 +176,7 @@ namespace IRaCIS.Core.Application.Services
|
||||||
IsDeleted = false,
|
IsDeleted = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Console.WriteLine("开始 发布系统文档");
|
||||||
|
|
||||||
Task.Run(async () =>
|
Task.Run(async () =>
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue