修改机场三字码SQL条件

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -192,6 +192,7 @@ namespace OASystem.API.Controllers
             }
         }
         #endregion
+
         #region 企业操作
         /// <summary>
         /// 查询企业数据

OASystem/OASystem.Infrastructure/Repositories/Resource/ThreeCodeRepository.cs

@@ -27,7 +27,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             try
             {
                 string sqlWhere = string.Empty;
-                if (!string.IsNullOrWhiteSpace(dto.City))
+                if (!string.IsNullOrWhiteSpace(dto.City) && dto.City!="全部")
                 {
                     sqlWhere += string.Format(@" And City like '%{0}%'", dto.City);
                 }

OASystem/OASystem.Infrastructure/Repositories/System/SetDataTypeRepository.cs

@@ -91,13 +91,13 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 }
                 else if (dto.PortType == 2)
                 {
-                    string sql = string.Format(@"select * from Res_HotelData {0}", sqlWhere);
-                    List<Res_HotelData> HotelDataData = await _sqlSugar.SqlQueryable<Res_HotelData>(sql).ToListAsync();
-                    if (HotelDataData.Count == 0)
+                    string sql = string.Format(@"select s.*,u.CnName from Sys_setDataType s left join Sys_Users u on s.CreateUserId=u.Id  {0}", sqlWhere);
+                    List<SetDataTypeView> SetDataType = await _sqlSugar.SqlQueryable<SetDataTypeView>(sql).ToListAsync();
+                    if (SetDataType.Count == 0)
                     {
                         return result = new Result() { Code = -1, Msg = "暂无数据" };
                     }
-                    HotelDataData = HotelDataData.OrderByDescending(x => x.CreateTime).ToList();
+                    SetDataType = SetDataType.OrderByDescending(x => x.CreateTime).ToList();
 
                     if (dto.PageSize == 0 && dto.PageIndex == 0)
                     {
@@ -105,23 +105,23 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             Code = 0,
                             Msg = "查询成功",
-                            Data = HotelDataData,
+                            Data = SetDataType,
                         };
                     }
                     else
                     {
-                        int count = HotelDataData.Count;
+                        int count = SetDataType.Count;
                         float totalPage = (float)count / dto.PageSize;//总页数
                         if (totalPage == 0) totalPage = 1;
                         else totalPage = (int)Math.Ceiling((double)totalPage);
 
-                        List<Res_HotelData> _HotelData = new List<Res_HotelData>();
+                        List<SetDataTypeView> _SetDataTypeView = new List<SetDataTypeView>();
                         for (int i = 0; i < dto.PageSize; i++)
                         {
                             var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
-                            if (RowIndex < HotelDataData.Count)
+                            if (RowIndex < SetDataType.Count)
                             {
-                                _HotelData.Add(HotelDataData[RowIndex]);
+                                _SetDataTypeView.Add(SetDataType[RowIndex]);
                             }
                             else
                             {
@@ -132,7 +132,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             Code = 0,
                             Msg = "查询成功",
-                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _HotelData },
+                            Data = new { pageCount = count, totalPage = (int)totalPage, pageIndex = dto.PageIndex, pageSize = dto.PageSize, pageSource = _SetDataTypeView },
                         };
                     }
                 }