Commit f9fdd720 authored by 黄奎's avatar 黄奎

页面修改

parent bc755216
...@@ -40,7 +40,7 @@ WHERE 1=1 ...@@ -40,7 +40,7 @@ WHERE 1=1
{ {
builder.Append($" AND A.{nameof(RB_Department_ViewModel.Group_Id)}={query.Group_Id} "); builder.Append($" AND A.{nameof(RB_Department_ViewModel.Group_Id)}={query.Group_Id} ");
} }
if (query.School_Id > 0) if (query.School_Id > -1)
{ {
builder.Append($" AND A.{nameof(RB_Department_ViewModel.School_Id)}={query.School_Id} "); builder.Append($" AND A.{nameof(RB_Department_ViewModel.School_Id)}={query.School_Id} ");
} }
......
...@@ -1199,7 +1199,20 @@ namespace Edu.WebApi.Controllers.User ...@@ -1199,7 +1199,20 @@ namespace Edu.WebApi.Controllers.User
public ApiResult GetDeptPageList() public ApiResult GetDeptPageList()
{ {
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<RB_Department_ViewModel>(RequestParm.Msg.ToString()); var query = new RB_Department_ViewModel()
{
DeptId = base.ParmJObj.GetInt("DeptId"),
DeptName = base.ParmJObj.GetStringValue("DeptName"),
DeptTier=base.ParmJObj.GetInt("DeptTier"),
ParentId=base.ParmJObj.GetInt("ParentId"),
Status=(DateStateEnum)base.ParmJObj.GetInt("Status"),
};
query.School_Id = -1;
var School_Id = base.ParmJObj.GetStringValue("School_Id");
if (!string.IsNullOrEmpty(School_Id))
{
query.School_Id = base.ParmJObj.GetInt("School_Id");
}
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = departmentModule.GetDepartmentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = departmentModule.GetDepartmentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
......
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