Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupCostParameterRepository.cs

@@ -79,10 +79,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     };
                     dynamics.Add(AirGW);
 
-                    List<Grp_DayAndCost> dac1 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 1).ToList();  //酒店费用
-                    List<Grp_DayAndCost> dac2 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 2).ToList(); //餐费用
+                    List<Grp_DayAndCost> dac1 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 1 && x.NationalTravelFeeId > 0).ToList();  //酒店费用
+                    List<Grp_DayAndCost> dac2 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 2 && x.NationalTravelFeeId > 0).ToList(); //餐费用
                     List<Grp_DayAndCost> dac3 = (from item in _sqlSugar.Queryable<Grp_DayAndCost>() //公杂费用
-                                                 where item.DiId == diid && item.Type == 3
+                                                 where item.DiId == diid && item.Type == 3 && item.NationalTravelFeeId > 0
                                                  select item).ToList();
 
                     decimal SumHotel = 0;