1

BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs

@@ -157,15 +157,15 @@ namespace BBWY.Server.Business.Sync
 
             var ads = fsql.Select<JDPopularizeAdSku>()
                                 .Where(c => c.ShopId == shopId && adNames.Contains(c.AdName))
-                                .GroupBy(c => new { c.AdId, c.AdName })
-                                .ToList(g => new { g.Key.AdId, g.Key.AdName });
+                                .GroupBy(c => new { c.AdId, c.AdName, c.AdGroupId })
+                                .ToList(g => new { g.Key.AdId, g.Key.AdName, g.Key.AdGroupId });
 
             var insertList = new List<JDOrderPopularizeRelation>();
             foreach (var j in jArray)
             {
                 var campaign = campaigns.FirstOrDefault(c => c.CampaignName == j.Value<string>("campaignName"));
                 var adGroup = adGroups.FirstOrDefault(g => g.AdGroupName == j.Value<string>("adGroupName"));
-                var ad = ads.FirstOrDefault(a => a.AdName == j.Value<string>("adName"));
+                var ad = ads.FirstOrDefault(a => a.AdName == j.Value<string>("adName") && adGroup != null && adGroup.AdGroupId == a.AdGroupId);
 
                 var popularizeSku = string.Empty;
                 if (ad != null)