|
|
@@ -51,8 +51,17 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
};
|
|
|
EncryptionProcessor.EncryptProperties(exists);
|
|
|
|
|
|
- res_InvitationOfficialActivityData = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
|
|
|
- .First(a =>a.Country== exists.InviterArea && a.UnitName== exists.Inviter && a.IsDel == 0);
|
|
|
+ if (grp_Invitation.DataId > 0)
|
|
|
+ {
|
|
|
+ res_InvitationOfficialActivityData = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
|
|
|
+ .First(a => a.Id == grp_Invitation.DataId && a.IsDel == 0);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ res_InvitationOfficialActivityData = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
|
|
|
+ .First(a => a.Country == exists.InviterArea && a.UnitName == exists.Inviter && a.IsDel == 0);
|
|
|
+ }
|
|
|
+
|
|
|
EncryptionProcessor.DecryptProperties(res_InvitationOfficialActivityData);
|
|
|
if (dto.PortType == 1)
|
|
|
{
|
|
|
@@ -463,6 +472,8 @@ Order By i.id Desc ", sqlWhere);
|
|
|
.Where(a => a.Id == ifNullUp.Id)
|
|
|
.SetColumns(a => new Res_InvitationOfficialActivityData
|
|
|
{
|
|
|
+ UnitName = res_InvitationData.UnitName,
|
|
|
+ Country = res_InvitationData.Country,
|
|
|
Contact = res_InvitationData.Contact,
|
|
|
Tel = res_InvitationData.Tel,
|
|
|
Job = res_InvitationData.Job,
|
yuanrf