1

gx_api/GxPress/Model/GxPress.Result/Navigation/NavigationResult.cs

@@ -290,6 +290,16 @@ namespace GxPress.Result.Navigation
         /// </summary>
         /// <value></value>
         public IEnumerable<PressResult> PressItems { get; set; }
+         /// <summary>
+        /// 开始时间
+        /// </summary>
+        /// <value></value>
+        public string BeginTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        /// <value></value>
+        public string EndTime { get; set; }
     }
     /// <summary>
     /// 老师搜索

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -792,7 +792,7 @@ namespace GxPress.Repository.Implement.Media
             if (request.MediaIds.Count() > 0)
                 query.WhereIn(nameof(Entity.tede2.Media.Media.Id), request.MediaIds);
             if (request.AuthorId != null && request.AuthorId.Count > 0)
-                query.OrWhereIn(nameof(Entity.tede2.Media.Media.TeacherId), request.AuthorId);
+                query.WhereIn(nameof(Entity.tede2.Media.Media.TeacherId), request.AuthorId);
             resut.Total = await _repository.CountAsync(query);
             if (!string.IsNullOrEmpty(request.BeginTime) && !string.IsNullOrEmpty(request.EndTime))
             {

gx_api/GxPress/Service/GxPress.Service.Implement/AppHomePage/AppHomePageService.Search.cs

@@ -15,7 +15,6 @@ namespace GxPress.Service.Implement.AppHomePage
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-
         public async Task<NavigationSearchResult> GetNavigationSearchResultAsync(NavigationSearchRequest request)
         {
             var result = new NavigationSearchResult()
@@ -24,6 +23,12 @@ namespace GxPress.Service.Implement.AppHomePage
                 TeacherItems = await GetNavigationSearchResultAysnc(request),
                 YearItems = await GetNavigationYearResult(request)
             };
+            var database = new Database(DatabaseType.MySql, Common.Tools.ConfigHelper.GetValue("Database:ConnectionString"));
+            var connection = database.GetConnection();
+            var maxYearSql = $"select max(AddDate) from tede_media where id in( SELECT MediaId FROM tede_system_lable_media where typevalue=1)";
+            result.EndTime = await connection.ExecuteScalarAsync<string>(maxYearSql);
+            var minYearSql = $"select min(AddDate) from tede_media where id in( SELECT MediaId FROM tede_system_lable_media where typevalue=1)";
+            result.BeginTime = await connection.ExecuteScalarAsync<string>(minYearSql);
             return result;
         }