Commit ab268e73 authored by 黄奎's avatar 黄奎

新增字段

parent e3e5f855
......@@ -74,5 +74,25 @@ namespace Edu.Model.CacheModel
/// 用户头像
/// </summary>
public string UserIcon { get; set; }
/// <summary>
/// 部门编号
/// </summary>
public int DeptId { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DeptName { get; set; }
/// <summary>
/// 岗位编号
/// </summary>
public int PostId { get; set; }
/// <summary>
/// 岗位名称
/// </summary>
public string PostName { get; set; }
}
}
\ No newline at end of file
......@@ -21,18 +21,13 @@ namespace Edu.Model.Entity.User
/// </summary>
public string DeptName { get; set; }
/// <summary>
/// 部门负责人
/// </summary>
public int DeptManager { get; set; }
/// <summary>
/// 部门电话
/// </summary>
public string DeptTel { get; set; }
/// <summary>
/// 部门负责人编号
/// 部门负责人编号【多个逗号分隔】
/// </summary>
public string ManagerIds { get; set; }
......
......@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.User
/// 角色列表
/// </summary>
public string RoleAuth { get; set; }
/// <summary>
/// 部门编号
/// </summary>
public int Dept_Id { get; set; }
/// <summary>
/// 岗位编号
/// </summary>
public int Post_Id { get; set; }
}
}
......@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.User
/// 更新时间
/// </summary>
public DateTime UpdateTime { get; set; }
/// <summary>
/// 部门编号
/// </summary>
public int Dept_Id { get; set; }
}
}
\ No newline at end of file
......@@ -111,5 +111,15 @@ namespace Edu.Model.Entity.User
/// 教师标签
/// </summary>
public string TeachTag { get; set; }
/// <summary>
/// 部门编号
/// </summary>
public int Dept_Id { get; set; }
/// <summary>
/// 岗位编号
/// </summary>
public int Post_Id { get; set; }
}
}
\ No newline at end of file
......@@ -28,5 +28,10 @@ namespace Edu.Model.ViewModel.User
/// 修改时间
/// </summary>
public string UpdateTimeStr { get { return Common.ConvertHelper.FormatTime(this.UpdateTime); } }
/// <summary>
/// 集团名称
/// </summary>
public string GroupName { get; set; }
}
}
\ No newline at end of file
......@@ -26,8 +26,8 @@ namespace Edu.Repository.User
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM rb_department AS A
SELECT A.*,IFNULL(B.GroupName,'') AS GroupName
FROM rb_department AS A LEFT JOIN rb_group AS B ON A.Group_Id=B.GId
WHERE 1=1
");
if (query != null)
......
......@@ -774,6 +774,7 @@ namespace Edu.WebApi.Controllers.User
extModel.UpdateBy = base.UserInfo.Id;
extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = base.UserInfo.Group_Id;
extModel.Status = Common.Enum.DateStateEnum.Normal;
bool flag = departmentModule.SetDepartmentModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -811,7 +812,7 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetPostPage()
public ApiResult GetPostPageList()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Post_ViewModel>(RequestParm.Msg.ToString());
......@@ -860,6 +861,7 @@ namespace Edu.WebApi.Controllers.User
extModel.UpdateBy = base.UserInfo.Id;
extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = base.UserInfo.Group_Id;
extModel.Status = Common.Enum.DateStateEnum.Normal;
bool flag = postModule.SetPostModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
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