页面修改

Edu.Model/ViewModel/User/RB_Teacher_ViewModel.cs

@@ -99,5 +99,10 @@ namespace Edu.Model.ViewModel.User
                 return str;
             }
         }
+
+        /// <summary>
+        /// 是否查询离职老师(1-是)
+        /// </summary>
+        public int IsQLeave { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Course_CategoryRepository.cs

@@ -79,10 +79,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Category_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Category_ViewModel.School_Id), query.School_Id);
-                }
+                //if (query.School_Id > 0)
+                //{
+                //    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Category_ViewModel.School_Id), query.School_Id);
+                //}
                 if (query.CateId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Category_ViewModel.CateId), query.CateId);

Edu.Repository/User/RB_TeacherRepository.cs

@@ -73,6 +73,15 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Teacher_ViewModel.TId), query.QTIds);
                 }
+                //在职老师
+                if (query.IsQLeave == 0)
+                {
+                    builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Teacher_ViewModel.LeaveStatus), "1,2,3");
+                }
+                else
+                {
+                    builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Teacher_ViewModel.LeaveStatus), "1,2,3,4");
+                }
             }
             return Get<RB_Teacher_ViewModel>(builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -339,7 +339,10 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult GetTeacherList()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Teacher_ViewModel>(RequestParm.Msg.ToString());
+            var query = new RB_Teacher_ViewModel()
+            {
+                IsQLeave=base.ParmJObj.GetInt("IsQLeave")
+            };
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
             var list = teacherModule.GetTeacherListModule(query);