Commit 6139e8e7 authored by 黄奎's avatar 黄奎

页面修改

parent bbafe4fd
...@@ -429,6 +429,7 @@ namespace Edu.Module.User ...@@ -429,6 +429,7 @@ namespace Edu.Module.User
var model = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() var model = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{ {
AccountId = AccountId, AccountId = AccountId,
School_Id = -1,
AccountTypeStr = ((int)AccountType).ToString() AccountTypeStr = ((int)AccountType).ToString()
})?.FirstOrDefault(); })?.FirstOrDefault();
if (model != null && model.Id > 0) if (model != null && model.Id > 0)
......
...@@ -757,7 +757,20 @@ namespace Edu.WebApi.Controllers.User ...@@ -757,7 +757,20 @@ namespace Edu.WebApi.Controllers.User
public ApiResult GetManagerPageList() public ApiResult GetManagerPageList()
{ {
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString()); var query = new Employee_ViewModel()
{
Dept_Id=base.ParmJObj.GetInt("Dept_Id"),
EmployeeName=base.ParmJObj.GetStringValue("EmployeeName"),
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=base.ParmJObj.GetInt("School_Id"),
StartBirthDate=base.ParmJObj.GetStringValue("StartBirthDate"),
StartEntryTime=base.ParmJObj.GetStringValue("StartEntryTime"),
StartLeaveTime=base.ParmJObj.GetStringValue("StartLeaveTime"),
};
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment