Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.User/TeacherModule.cs

@@ -74,9 +74,6 @@ namespace Edu.Module.User
                     {nameof(RB_Teacher_ViewModel.UpdateBy),model.UpdateBy },
                     {nameof(RB_Teacher_ViewModel.UpdateTime),model.UpdateTime },
                     {nameof(RB_Teacher_ViewModel.AuditStatus),model.AuditStatus },
-                    {nameof(RB_Teacher_ViewModel.CourseCount),model.CourseCount },
-                    {nameof(RB_Teacher_ViewModel.OnlineClassCount),model.OnlineClassCount },
-                    {nameof(RB_Teacher_ViewModel.OnlineOrderCount),model.OnlineOrderCount },
                     {nameof(RB_Teacher_ViewModel.TeachTag),model.TeachTag }
                 };
                 flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId));

Edu.Repository/User/RB_TeacherRepository.cs

@@ -130,6 +130,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.TId), query.TId);
                 }
+                if (query.IsShow!=-1)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.IsShow), query.IsShow);
+                }
+                if ((int)query.AuditStatus != -1)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.AuditStatus), query.AuditStatus);
+                }
             }
             return GetPage<RB_Teacher_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }