Procházet zdrojové kódy

1、团组商邀公务-公务出访-省外办请示文件 处理黑屏代码未录入情况

LEIYI před 8 měsíci
rodič
revize
70c9c1acdc

+ 6 - 2
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2250,10 +2250,14 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 List<Grp_TravelList> travelList = new List<Grp_TravelList>();
                 travelList = opTripView.Data as List<Grp_TravelList>;
 
-                foreach (var item in travelList)
+                if (travelList != null || travelList.Count > 0)
                 {
-                    schedulingStr += $"{item.Date}({item.WeekDay})\r\n{item.Trip}\r\n";
+                    foreach (var item in travelList)
+                    {
+                        schedulingStr += $"{item.Date}({item.WeekDay})\r\n{item.Trip}\r\n";
+                    }
                 }
+                
 
                 #endregion
 

+ 0 - 2
OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -1266,7 +1266,6 @@ namespace OASystem.Domain.ViewModels.Financial
             {
                 _yoy = (currPeriodFee - samePeriodFee) / samePeriodFee;
             }
-
             this.Yoy = decimal.Parse(_yoy.ToString("0.##"));
             this.CurrPeriodGroupTotal = currPeriodGroupTotal;
             this.SamePeriodGroupTotal = samePeriodGroupTotal;
@@ -1274,7 +1273,6 @@ namespace OASystem.Domain.ViewModels.Financial
         }
     }
 
-
     public class StatisticsOPCityYOY
     {
         public string CityName { get; set; }