1

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -1571,6 +1571,8 @@ namespace REBORN.Module.DMCModule
                 }
                 #endregion
 
+                req.TourGuides = new TourGuide[0];
+
                 var payload = service.GetJson(req);
                 LogHelper.Write(payload);
 

REBORN.Module.FinanceModule/FinanceWorkFlowModule_p3.cs

@@ -9060,6 +9060,10 @@ namespace REBORN.Module.FinanceModule
             //再次查询一下 
             var flist = RB_FinanceRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = userInfo.RB_Group_id, FrIDs = frids });
             var dList = RB_FinanceDetailRepository.GetList(new RB_FinanceDetail_Extend() { GroupId = userInfo.RB_Group_id, FrIds = frids });
+            if (flist.Any() && flist.Count() == 1)
+            {
+                if (dList.Where(x => x.CostTypeId == ctModel.ID).Any()) { return true; }
+            }
 
             List<int> CurrencyList = tradeWays.Select(x => x.CurrencyId ?? 0).Distinct().ToList();
             List<string> content = new List<string>();

REBORN.Services.DMCService/TravelContractService.cs

@@ -1171,7 +1171,8 @@ namespace REBORN.Services.DMCService
                                 model.ContractGuestList.Add(new ContractGuest()
                                 {
                                     CGuestName = item.SurName + item.Name,
-                                    CGuestSex = item.Sex == 1 ? "男" : "女",
+                                    //CGuestSex = item.Sex == 1 ? "男" : item.Sex == 2 ? "女" : "",
+                                    CGuestSex = "",
                                     CGuestCertificateType = "身份证",
                                     CGuestCertificateNum = item.IdCard,
                                     CGuestTel = item.Tel,
@@ -1195,7 +1196,8 @@ namespace REBORN.Services.DMCService
                                 model.ContractGuestList.Add(new ContractGuest()
                                 {
                                     CGuestName = item.SurName + item.Name,
-                                    CGuestSex = item.Sex == 1 ? "男" : "女",
+                                    //CGuestSex = item.Sex == 1 ? "男" : item.Sex == 2 ? "女" :"",
+                                    CGuestSex = "",
                                     CGuestCertificateType = "身份证",
                                     CGuestCertificateNum = item.IdCard,
                                     CGuestTel = item.Tel,