Commit 838b654d authored by 黄奎's avatar 黄奎

页面修改

parent b5090a6e
...@@ -83,5 +83,10 @@ namespace Mall.Model.Entity.User ...@@ -83,5 +83,10 @@ namespace Mall.Model.Entity.User
get; get;
set; set;
} }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
} }
} }
...@@ -76,5 +76,15 @@ namespace Mall.Model.Entity.User ...@@ -76,5 +76,15 @@ namespace Mall.Model.Entity.User
get; get;
set; set;
} }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
} }
} }
...@@ -13,6 +13,16 @@ namespace Mall.Model.Entity.User ...@@ -13,6 +13,16 @@ namespace Mall.Model.Entity.User
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Employee_Extend : Model.Entity.User.RB_Employee public class RB_Employee_Extend : Model.Entity.User.RB_Employee
{ {
/// <summary>
/// 创建时间字符串
/// </summary>
public string CreateDateStr
{
get {
string str = "";
str = Convert.ToDateTime(this.CreateDate).ToString("yyyy-MM-dd HH:mm:ss");
return str;
}
}
} }
} }
\ No newline at end of file
...@@ -13,5 +13,22 @@ namespace Mall.Model.Entity.User ...@@ -13,5 +13,22 @@ namespace Mall.Model.Entity.User
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Role_Extend : Model.Entity.User.RB_Role public class RB_Role_Extend : Model.Entity.User.RB_Role
{ {
/// <summary>
/// 创建时间字符串
/// </summary>
public string CreateDateStr
{
get
{
string str = "";
str = Convert.ToDateTime(this.CreateDate).ToString("yyyy-MM-dd HH:mm:ss");
return str;
}
}
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set; }
} }
} }
\ No newline at end of file
...@@ -42,6 +42,16 @@ namespace Mall.WebApi.Controllers.User ...@@ -42,6 +42,16 @@ namespace Mall.WebApi.Controllers.User
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
var list = module.GetRolePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = module.GetRolePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
if (item.CreateBy > 0)
{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.Account ?? "";
}
}
}
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
...@@ -70,6 +80,9 @@ namespace Mall.WebApi.Controllers.User ...@@ -70,6 +80,9 @@ namespace Mall.WebApi.Controllers.User
extModel.Status = 0; extModel.Status = 0;
extModel.MallBaseId = RequestParm.MallBaseId; extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId; extModel.TenantId = RequestParm.TenantId;
Int32.TryParse(RequestParm.uid, out int Uid);
extModel.CreateBy = Uid;
extModel.CreateDate = DateTime.Now;
var flag = module.SetRoleModule(extModel); var flag = module.SetRoleModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
...@@ -140,6 +153,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -140,6 +153,7 @@ namespace Mall.WebApi.Controllers.User
extModel.Status = 0; extModel.Status = 0;
extModel.MallBaseId = RequestParm.MallBaseId; extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId; extModel.TenantId = RequestParm.TenantId;
extModel.CreateDate = DateTime.Now;
var flag = module.SetEmployeeModule(extModel); var flag = module.SetEmployeeModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
...@@ -169,7 +183,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -169,7 +183,7 @@ namespace Mall.WebApi.Controllers.User
} }
#endregion #endregion
#region 员工管理 #region 员工配置管理
/// <summary> /// <summary>
......
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