Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Model/Entity/Finance/RB_Customer_Invoice.cs

@@ -61,5 +61,13 @@ namespace REBORN.Model.Entity.Finance
         /// 申请人
         /// </summary>
         public int? CreateBy { get; set; }
+        /// <summary>
+        /// 集团
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
     }
 }

REBORN.Module.DMCModule/RB_Travel_InvoiceApplyModule.cs

@@ -87,7 +87,7 @@ namespace REBORN.Module.DMCModule
                         item.CustomerName = item.InvoiceApplyList.FirstOrDefault()?.CompanyName ?? "";
                     }
                 }
-                if(list.Where(x => x.Type == 0).Any())
+                if (list.Where(x => x.Type == 0).Any())
                 {
                     string orderIds = string.Join(",", list.Where(x => x.Type == 0).Select(x => x.OrderId));
                     var invoiceApplyList = GetInvoiceApplyList(new RB_Travel_InvoiceApply_Extend { QOrderIds = orderIds, InvoiceApplyType = model.InvoiceApplyType });
@@ -203,7 +203,8 @@ namespace REBORN.Module.DMCModule
                         Address = model.Address,
                         CompanyPhone = model.CompanyPhone,
                         OpeningBank = model.OpeningBank,
-                        BankNo = model.BankNo
+                        BankNo = model.BankNo,
+                        RB_Group_Id = model.RB_Group_Id,
                     };
                     if (model.CustomerInvoiceId == 0)
                     {

REBORN.Repository/Finance/RB_Customer_InvoiceRepository.cs

@@ -30,6 +30,10 @@ namespace REBORN.Repository.Finance
             {
                 where += string.Format(" AND A." + nameof(RB_Customer_Invoice.CreateBy) + "={0}", model.CreateBy);
             }
+            if ((model?.RB_Group_Id ?? 0) > 0)
+            {
+                where += string.Format(" AND A." + nameof(RB_Customer_Invoice.RB_Group_Id) + "={0}", model.RB_Group_Id);
+            }
             if (model.CustomerID > 0)
             {
                 where += string.Format(" AND A." + nameof(RB_Customer_Invoice.CustomerID) + "={0}", model.CustomerID);

REBORN.Services.DMCService/RB_Travel_InvoiceApplyService.cs

@@ -1034,6 +1034,7 @@ namespace REBORN.Services.DMCService
             }
             //
             // JsonConvert.DeserializeObject<Model.Entity.Finance.RB_Customer_Invoice>(request.msg.ToString());
+            model.RB_Group_Id = userInfo.RB_Group_id;
             List<Model.Entity.Finance.RB_Customer_Invoice> customerInfoList = module.GetCustomerInvoiceList(model);
             return ApiResult.Success("获取成功", customerInfoList);
         }