页面修改

Edu.Module.User/ManagerModule.cs

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

Edu.Module.User/TeacherModule.cs

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

Edu.WebApi/Controllers/User/UserController.cs

@@ -1623,12 +1623,13 @@ namespace Edu.WebApi.Controllers.User
                 EndBirthDate = base.ParmJObj.GetStringValue("EndBirthDate"),
                 EndEntryTime = base.ParmJObj.GetStringValue("EndEntryTime"),
                 EndLeaveTime = base.ParmJObj.GetStringValue("EndLeaveTime"),
-                LeaveStatus = (LeaveStatusEnum)base.ParmJObj.GetInt("LeaveStatus"),
+                
                 Post_Id = base.ParmJObj.GetInt("Post_Id"),
                 School_Id = -1,
                 StartBirthDate = base.ParmJObj.GetStringValue("StartBirthDate"),
                 StartEntryTime = base.ParmJObj.GetStringValue("StartEntryTime"),
                 StartLeaveTime = base.ParmJObj.GetStringValue("StartLeaveTime"),
+                IsLeave=base.ParmJObj.GetInt("IsLeave"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);