Parcourir la source

部分逻辑添加

yuanrf il y a 2 jours
Parent
commit
3a761fbd2a
1 fichiers modifiés avec 37 ajouts et 34 suppressions
  1. 37 34
      OASystem/OASystem.Api/Controllers/GroupsController.cs

+ 37 - 34
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -17547,42 +17547,45 @@ end as 'country'
                     try
                     {
                         var visa = _sqlSugar.Queryable<Res_VisaFeeStandard>()
-                       .Where(x => x.IsDel == 0 && x.Country == item)
-                       .ToList();
-                        var visainfo = _sqlSugar.Queryable<Res_VisaFeeStandardDetails>()
-                        .Where(x => x.IsDel == 0 && visa.Select(x => x.Id).Contains(x.ParentId))
-                        .ToList();
-                        var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id);
-                        var visayinsiValue = visainfo.FirstOrDefault(x => x.ParentId == visa.FirstOrDefault(x => x.FeeType == 1)?.Id);
-                        visaCountryInfoArr.Add(new
+                            .Where(x => x.IsDel == 0 && x.Country == item)
+                            .ToList();
+                        if (visa.Any())
                         {
-                            country = item,
-                            yinsi = new
-                            {
-                                Id = visayinsiValue.Id,
-                                value = visayinsiValue.SmallVisaPrice
-                            },
-                            visaMain = new
+                            var visainfo = _sqlSugar.Queryable<Res_VisaFeeStandardDetails>()
+                            .Where(x => x.IsDel == 0 && visa.Select(x => x.Id).Contains(x.ParentId))
+                            .ToList();
+                            var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id);
+                            var visayinsiValue = visainfo.FirstOrDefault(x => x.ParentId == visa.FirstOrDefault(x => x.FeeType == 1)?.Id);
+                            visaCountryInfoArr.Add(new
                             {
-                                Id = visaMain.Id,
-                                IsVisaOnArrival = visaMain.IsVisaOnArrival ? "是" : "否",
-                                IsElectronicSign = visaMain.IsElectronicSign ? "是" : "否",
-                                VisaTime = visaMain.VisaTime,
-                                IsVisaExemptionLarge = visaMain.IsVisaExemptionLarge ? "是" : "否",
-                                LargeVisaPrice = visaMain.LargeVisaPrice,
-                                LargeAgencyFee = visaMain.LargeAgencyFee,
-                                IsVisaExemptionSmall = visaMain.IsVisaExemptionSmall ? "是" : "否",
-                                SmallVisaPrice = visaMain.SmallVisaPrice,
-                                SmallAgencyFee = visaMain.SmallAgencyFee,
-                                NormExtFee = visaMain.NormExtFee,
-                                UrgExtFee = visaMain.UrgExtFee,
-                                IsUrgent = visaMain.IsUrgent ? "是" : "否",
-                                UrgentTime = visaMain.UrgentTime,
-                                UrgentPrice = visaMain.UrgentPrice,
-                                UrgentPriceDesc = visaMain.UrgentPriceDesc,
-                                Remark = visaMain.Remark,
-                            }
-                        });
+                                country = item,
+                                yinsi = new
+                                {
+                                    Id = visayinsiValue.Id,
+                                    value = visayinsiValue.SmallVisaPrice
+                                },
+                                visaMain = new
+                                {
+                                    Id = visaMain.Id,
+                                    IsVisaOnArrival = visaMain.IsVisaOnArrival ? "是" : "否",
+                                    IsElectronicSign = visaMain.IsElectronicSign ? "是" : "否",
+                                    VisaTime = visaMain.VisaTime,
+                                    IsVisaExemptionLarge = visaMain.IsVisaExemptionLarge ? "是" : "否",
+                                    LargeVisaPrice = visaMain.LargeVisaPrice,
+                                    LargeAgencyFee = visaMain.LargeAgencyFee,
+                                    IsVisaExemptionSmall = visaMain.IsVisaExemptionSmall ? "是" : "否",
+                                    SmallVisaPrice = visaMain.SmallVisaPrice,
+                                    SmallAgencyFee = visaMain.SmallAgencyFee,
+                                    NormExtFee = visaMain.NormExtFee,
+                                    UrgExtFee = visaMain.UrgExtFee,
+                                    IsUrgent = visaMain.IsUrgent ? "是" : "否",
+                                    UrgentTime = visaMain.UrgentTime,
+                                    UrgentPrice = visaMain.UrgentPrice,
+                                    UrgentPriceDesc = visaMain.UrgentPriceDesc,
+                                    Remark = visaMain.Remark,
+                                }
+                            });
+                        }
                     }
                     catch (Exception ex)
                     {