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

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

@@ -93,10 +93,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     UserId = "0";
                 }
-                string sql = string.Format(@"select a.*,c.IsAuditGM,(select Name from Sys_SetData where Id=a.cType) as 'CTypeName',(select Name from 
-                                                Sys_SetData where Id=a.PreCurrency) as 'PreCurrencyStr',(select Name from Sys_SetData where Id=a.Currency)
-                                                as 'CurrencyStr' from Grp_AirTicketReservations a,Grp_CreditCardPayment c where  a.id=c.CId  and a.isdel={1} and c.IsDel={1}
-                                                and a.DIId={0} and c.DIId={0} and c.CTable=85 and a.CreateUserId in({2}) Order By a.CreateTime desc", dto.DiId, 0,UserId);
+                string sql = string.Format(@"Select atr.*,ccp.IsAuditGM,sd1.Name As CTypeName,sd2.Name As PreCurrencyStr,sd3.Name As CurrencyStr
+                                             From Grp_AirTicketReservations atr
+                                             Left Join Grp_CreditCardPayment ccp On atr.Id = ccp.CId  And atr.DIId = ccp.DIId And ccp.IsDel = 0
+                                             Left Join Sys_SetData sd1 On sd1.Id = atr.ctype
+                                             Left Join Sys_SetData sd2 On sd2.Id = atr.PreCurrency
+                                             Left Join Sys_SetData sd3 On sd3.Id = atr.Currency
+                                             Where atr.IsDel = 0 And atr.DIId={0} 
+                                             Order By atr.CreateTime desc", dto.DiId);
                 List<AirTicketReservationsView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsView>(sql).ToList();
 
                 foreach (var item in _AirTicketReservations)
@@ -877,12 +881,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
             Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
             {
-                string sql = string.Format(@"select d.TourCode,d.TeamName,a.FlightsCity,a.FlightsCode,a.FlightsDescription,(select Name from Sys_SetData where Id=a.cType) as 'CTypeName',a.ClientName,a.ClientNum,
-                                a.PrePrice,a.Price,(select Name from Sys_SetData where Id=c.PayDId) as 'PayType', case when 
-                                c.OrbitalPrivateTransfer=0 then '公转' when c.OrbitalPrivateTransfer=1 then '私转' end as OrbitalPrivateTransfer,c.BankNo,c.CreateTime,
-                                c.Payee,a.PriceDescription,(select Name from Sys_SetData where Id=a.Currency) as 'CurrencyStr',(select Name from Sys_SetData where Id=c.CTDId) as BankType
-                                from Grp_AirTicketReservations a,Grp_CreditCardPayment c ,Grp_DelegationInfo d where  a.id=c.CId and d.Id=a.DIId  and a.isdel=0
-                                and a.DIId={0} Order By a.CreateTime desc", dto.DiId, 0);
+                string sql = string.Format(@"Select atr.*,ccp.IsAuditGM,sd1.Name As 'CTypeName',sd2.Name As 'PreCurrencyStr',sd3.Name  As CurrencyStr
+From Grp_AirTicketReservations atr
+Left Join Grp_CreditCardPayment ccp On atr.Id = ccp.CId  And atr.DIId = ccp.DIId And ccp.IsDel = 0
+Left Join Sys_SetData sd1 On sd1.Id = atr.ctype
+Left Join Sys_SetData sd2 On sd2.Id = atr.PreCurrency
+Left Join Sys_SetData sd3 On sd3.Id = atr.Currency
+Where atr.IsDel = 0 And atr.DIId={0} And atr.CreateUserId = {1}
+Order By atr.CreateTime desc", dto.DiId, dto.UserId);
                 List<AirTicketReservationsPayView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsPayView>(sql).ToList();
                 if (_AirTicketReservations.Count != 0)
                 {

OASystem/OASystem.Infrastructure/Repositories/Groups/TourClientListRepository.cs

@@ -192,11 +192,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 return _result;
             }
 
-            if (string.IsNullOrEmpty(dto.IDCardNo))
-            {
-                _result.Msg = "客户身份证No为空!";
-                return _result;
-            }
+            //if (string.IsNullOrEmpty(dto.IDCardNo))
+            //{
+            //    _result.Msg = "客户身份证No为空!";
+            //    return _result;
+            //}
 
             if (dto.ShippingSpaceTypeId < 0)
             {
@@ -211,10 +211,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 _sqlSugar.BeginTran();
                 int clientId = -1;
                 int crmCompanyId = -1;
-                var clientInfo = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0 &&
-                                                                                         it.LastName.Equals(dto.LastName) &&
-                                                                                         it.FirstName.Equals(dto.FirstName) &&
-                                                                                         it.Phone.Equals(dto.Phone)
+                var clientInfo = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0 
+                                                                                         && it.LastName.Equals(dto.LastName) 
+                                                                                         && it.FirstName.Equals(dto.FirstName) 
+                                                                                         //&& it.Phone.Equals(dto.Phone)
                                                                                    ).FirstAsync();
 
                 Crm_CustomerCompany _CustomerCompany = new Crm_CustomerCompany()
@@ -271,7 +271,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     if (companyInfo != null)
                     {
                         crmCompanyId = companyInfo.Id;
-                        if (!companyInfo.CompanyFullName.Equals(dto.CompanyFullName))
+                        if (companyInfo.CompanyFullName.Equals(dto.CompanyFullName))
                         {
                             companyInfo.CompanyFullName = dto.CompanyFullName;
                             var companyEdit = await _sqlSugar.Updateable(companyInfo).UpdateColumns(it =>