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

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -141,12 +141,12 @@ namespace OASystem.API.Controllers
                                     string name = words.Substring(1);
                                     client.LastName = lastName;
                                     client.FirstName = name;
-                                    string lastNamePinYin = lastName.GetTotalPingYin()[0].ToUpper();
+                                    string lastNamePinYin = lastName.GetTotalPingYin().Count > 0 ? lastName.GetTotalPingYin()[0].ToUpper():"";
                                     string firstNamePinYin = "";
 
                                     for (int n = 0; n < name.Length; n++)
                                     {
-                                        firstNamePinYin += name[n].ToString().GetTotalPingYin()[0].ToUpper() + " ";
+                                        firstNamePinYin += name[n].ToString().GetTotalPingYin().Count > 0 ? name[n].ToString().GetTotalPingYin()[0].ToUpper() + " " : "";
                                     }
 
                                     client.Pinyin = lastNamePinYin + "/" + firstNamePinYin;

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -227,7 +227,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                 }
                 //团组成本预算表查询
-                Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == dto.DiId && a.IsDel==0);
+                Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == dto.DiId && a.IsDel==0 && a.CostType =="A" && a.IsShare == 1);
 
                 AirGroupCostParameterView _AirgroupCostParameter = _mapper.Map<AirGroupCostParameterView>(_GroupCostParameter);
                 for (int i = 0; i <_AirTicketReservations.Count; i++)