|
@@ -13175,7 +13175,11 @@ ORDER by gctggrc.id DESC
|
|
|
if (dele != null)
|
|
|
strFileName += $"{dele?.TeamName ?? ""}_{dele.TourCode}_";
|
|
|
|
|
|
- var guestDatas = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0).ToListAsync();
|
|
|
+ var guestDatas = await _sqlSugar.Queryable<Crm_DeleClient>()
|
|
|
+ .Select(x => new Crm_DeleClient { Id = x.Id, FirstName = x.FirstName, LastName = x.LastName, Pinyin = x.Pinyin })
|
|
|
+ .Where(it => it.IsDel == 0)
|
|
|
+ .ToListAsync();
|
|
|
+ foreach (var item in guestDatas) EncryptionProcessor.DecryptProperties(item);
|
|
|
for (int i = 0; i < hrDtas.Count; i++)
|
|
|
{
|
|
|
string guestNames = string.Empty;
|
|
@@ -13191,15 +13195,12 @@ ORDER by gctggrc.id DESC
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
bool guestIdBool = int.TryParse(item.GuestName, out int guestId);
|
|
|
if (guestIdBool)
|
|
|
{
|
|
|
guestIds.Add(guestId);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//NaN
|
|
|
if (item.GuestName.Contains("NaN"))
|
|
|
{
|