1

gx_api/GxPress/Model/GxPress.Request/Navigation/NavigationRequest.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace GxPress.Request.Navigation
 {
     public class NavigationRequest
@@ -33,17 +35,17 @@ namespace GxPress.Request.Navigation
         /// 作者ID
         /// </summary>
         /// <value></value>
-        public int TeacherId { get; set; }
+        public List<int> TeacherId { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         /// <value></value>
-        public string Unit { get; set; }
+        public List<string> Unit { get; set; }
         /// <summary>
         /// 出版社
         /// </summary>
         /// <value></value>
-        public string Press { get; set; }
+        public List<string> Press { get; set; }
 
     }
     /// <summary>

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

@@ -39,10 +39,22 @@ namespace GxPress.Service.Implement.AppHomePage
             if (request.CategoryId > 0)
                 categorySql += $" and lableId={request.CategoryId}";
             var teacherSql = "";
-            if (request.TeacherId > 0)
-                teacherSql += $" and TeacherId={request.TeacherId}";
-            if (!string.IsNullOrEmpty(request.Press))
-                teacherSql += $" and Press='{request.Press}'";
+            if (request.TeacherId != null && request.TeacherId.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.TeacherId)
+                    str += "{item},";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" and TeacherId in({str})";
+            }
+            if (request.Press != null && request.Press.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.Press)
+                    str += "'{item}',";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" or Press in ({str})";
+            }
             if (!string.IsNullOrEmpty(request.BeginTime) && !string.IsNullOrEmpty(request.EndTime))
             {
                 if (DateTime.TryParse(request.BeginTime, out var beginTime) && DateTime.TryParse(request.EndTime, out var endTime))
@@ -50,10 +62,13 @@ namespace GxPress.Service.Implement.AppHomePage
             }
             var sql = $"SELECT TeacherId,Author,count(1) as Count FROM tede_media where id in(select MediaId from tede_system_lable_media where TypeValue=1 {categorySql}) {teacherSql} and  Author is not null group by Author,TeacherId";
             var reuslt = await connection.QueryAsync<NavigationSearchTeacherResult>(sql);
-            if (request.TeacherId > 0)
+            if (request.TeacherId != null && request.TeacherId.Count > 0)
                 foreach (var item in reuslt)
                 {
-                    item.IsChecked = item.TeacherId.Equals(request.TeacherId);
+                    foreach (var teacherId in request.TeacherId)
+                    {
+                        item.IsChecked = item.TeacherId.Equals(teacherId);
+                    }
                 }
             return reuslt;
         }
@@ -69,10 +84,22 @@ namespace GxPress.Service.Implement.AppHomePage
             if (request.CategoryId > 0)
                 categorySql += $" and lableId={request.CategoryId}";
             var teacherSql = "";
-            if (request.TeacherId > 0)
-                teacherSql += $" and TeacherId={request.TeacherId}";
-            if (!string.IsNullOrEmpty(request.Press))
-                teacherSql += $" and Press='{request.Press}'";
+            if (request.TeacherId != null && request.TeacherId.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.TeacherId)
+                    str += "{item},";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" and TeacherId in({str})";
+            }
+            if (request.Press != null && request.Press.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.Press)
+                    str += "'{item}',";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" or Press in ({str})";
+            }
             if (!string.IsNullOrEmpty(request.BeginTime) && !string.IsNullOrEmpty(request.EndTime))
             {
                 if (DateTime.TryParse(request.BeginTime, out var beginTime) && DateTime.TryParse(request.EndTime, out var endTime))
@@ -105,10 +132,22 @@ namespace GxPress.Service.Implement.AppHomePage
             if (request.CategoryId > 0)
                 categorySql += $" and lableId={request.CategoryId}";
             var teacherSql = "";
-            if (request.TeacherId > 0)
-                teacherSql += $" and TeacherId={request.TeacherId}";
-            if (!string.IsNullOrEmpty(request.Press))
-                teacherSql += $" and Press='{request.Press}'";
+            if (request.TeacherId != null && request.TeacherId.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.TeacherId)
+                    str += "{item},";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" and TeacherId in({str})";
+            }
+            if (request.Press != null && request.Press.Count > 0)
+            {
+                var str = "";
+                foreach (var item in request.Press)
+                    str += "'{item}',";
+                str = str.Remove(str.Length - 1, 1);
+                teacherSql += $" or Press in ({str})";
+            }
             if (!string.IsNullOrEmpty(request.BeginTime) && !string.IsNullOrEmpty(request.EndTime))
             {
                 if (DateTime.TryParse(request.BeginTime, out var beginTime) && DateTime.TryParse(request.EndTime, out var endTime))