页面下修改

Edu.Model/ViewModel/User/RB_Teacher_ViewModel.cs

@@ -106,6 +106,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int IsQLeave { get; set; }
 
+        /// <summary>
+        /// 在职状态(1-在职，2-离职)
+        /// </summary>
+        public int IsLeave { get; set; }
+
         /// <summary>
         /// 直接主管 （OKR专用）
         /// </summary>

Edu.Module.User/ManagerModule.cs

@@ -86,7 +86,7 @@ namespace Edu.Module.User
             bool IsInsert = false, IsLeave = false, IsUpdate = true;
             if (model.MId > 0)
             {
-                if (model.LeaveStatus == LeaveStatusEnum.Departure)
+                if (model.LeaveStatus == LeaveStatusEnum.Departure&& !model.MName.Contains("(离职)"))
                 {
                     model.MName = model.MName.Trim() + "(离职)";
                 }

Edu.Module.User/TeacherModule.cs

@@ -128,7 +128,7 @@ namespace Edu.Module.User
             bool IsInsert = false, IsLeave = false, IsUpdate = true;
             if (model.TId > 0)
             {
-                if (model.LeaveStatus == LeaveStatusEnum.Departure)
+                if (model.LeaveStatus == LeaveStatusEnum.Departure &&!model.TeacherName.Contains("(离职)"))
                 {
                     model.TeacherName = model.TeacherName.Trim() + "(离职)";
                 }

Edu.Repository/User/RB_TeacherRepository.cs

@@ -158,6 +158,16 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.AuditStatus), (int)query.AuditStatus);
                 }
+                //在职
+                if (query.IsLeave == 1)
+                {
+                    builder.AppendFormat(" AND t.{0}<>{1} ", nameof(RB_Teacher_ViewModel.LeaveStatus), (int)LeaveStatusEnum.Departure);
+                }
+                //离职
+                else if (query.IsLeave == 2)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Teacher_ViewModel.LeaveStatus), (int)LeaveStatusEnum.Departure);
+                }
             }
             return GetPage<RB_Teacher_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -381,6 +381,7 @@ namespace Edu.WebApi.Controllers.User
                 IsShow = base.ParmJObj.GetInt("IsShow"),
                 AuditStatus = (AccountStatusEnum)base.ParmJObj.GetInt("AuditStatus"),
                 School_Id = -1,
+                IsLeave=base.ParmJObj.GetInt("IsLeave"),
             };
             var schoolId = base.ParmJObj.GetStringValue("School_Id");
             if (!string.IsNullOrEmpty(schoolId))
@@ -1623,7 +1624,6 @@ namespace Edu.WebApi.Controllers.User
                 EndBirthDate = base.ParmJObj.GetStringValue("EndBirthDate"),
                 EndEntryTime = base.ParmJObj.GetStringValue("EndEntryTime"),
                 EndLeaveTime = base.ParmJObj.GetStringValue("EndLeaveTime"),
-                
                 Post_Id = base.ParmJObj.GetInt("Post_Id"),
                 School_Id = -1,
                 StartBirthDate = base.ParmJObj.GetStringValue("StartBirthDate"),