集成CSRedis分布式存储,调整创建者和更新者字段,登录RSA使用配置文件配置私钥
This commit is contained in:
@@ -23,7 +23,7 @@ namespace ZR.Model.System.Dto
|
||||
{
|
||||
public string NoticeTitle { get; set; }
|
||||
public int? NoticeType { get; set; }
|
||||
public string CreateBy { get; set; }
|
||||
public string CreateName { get; set; }
|
||||
public int? Status { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,16 @@ namespace ZR.Model.System
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
[SugarColumn(IsOnlyIgnoreUpdate = true, Length = 64, IsNullable = true)]
|
||||
[SugarColumn(IsOnlyIgnoreUpdate = true)]
|
||||
[JsonProperty(propertyName: "CreateBy")]
|
||||
[ExcelIgnore]
|
||||
public string Create_by { get; set; }
|
||||
public long Create_by { get; set; }
|
||||
|
||||
[SugarColumn(IsOnlyIgnoreUpdate = true)]
|
||||
[JsonProperty(propertyName: "CreateName")]
|
||||
[ExcelIgnore]
|
||||
public string Create_name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
@@ -29,10 +34,16 @@ namespace ZR.Model.System
|
||||
/// </summary>
|
||||
[JsonIgnore]
|
||||
[JsonProperty(propertyName: "UpdateBy")]
|
||||
[SugarColumn(IsOnlyIgnoreInsert = true, Length = 64, IsNullable = true)]
|
||||
[SugarColumn(IsOnlyIgnoreInsert = true)]
|
||||
[ExcelIgnore]
|
||||
public string Update_by { get; set; }
|
||||
public long Update_by { get; set; }
|
||||
|
||||
[JsonIgnore]
|
||||
[JsonProperty(propertyName: "UpdateName")]
|
||||
[SugarColumn(IsOnlyIgnoreInsert = true)]
|
||||
[ExcelIgnore]
|
||||
public string Update_name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace ZR.Model.System
|
||||
/// </summary>
|
||||
[SugarTable("sys_role_menu", "角色菜单")]
|
||||
[Tenant("0")]
|
||||
public class SysRoleMenu : SysBase
|
||||
public class SysRoleMenu
|
||||
{
|
||||
[JsonProperty("roleId")]
|
||||
[SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)]
|
||||
|
||||
@@ -606,7 +606,7 @@ namespace ZR.Service
|
||||
Visible = "0",
|
||||
Status = "0",
|
||||
Icon = "icon1",
|
||||
Create_by = "system",
|
||||
Create_name = "system"
|
||||
};
|
||||
menu.MenuId = AddMenu(menu);
|
||||
}
|
||||
|
||||
@@ -38,9 +38,11 @@ namespace ZR.Service.System
|
||||
{
|
||||
var predicate = Expressionable.Create<SysNotice>();
|
||||
|
||||
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), m => m.NoticeTitle.Contains(parm.NoticeTitle));
|
||||
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle),
|
||||
m => m.NoticeTitle.Contains(parm.NoticeTitle));
|
||||
predicate = predicate.AndIF(parm.NoticeType != null, m => m.NoticeType == parm.NoticeType);
|
||||
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateBy), m => m.Create_by.Contains(parm.CreateBy) || m.Update_by.Contains(parm.CreateBy));
|
||||
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateName),
|
||||
m => m.Create_name.Contains(parm.CreateName) || m.Update_name.Contains(parm.CreateName));
|
||||
predicate = predicate.AndIF(parm.Status != null, m => m.Status == parm.Status);
|
||||
var response = GetPages(predicate.ToExpression(), parm);
|
||||
return response;
|
||||
|
||||
@@ -224,8 +224,6 @@ namespace ZR.Service
|
||||
{
|
||||
Menu_id = item,
|
||||
Role_id = sysRoleDto.RoleId,
|
||||
Create_by = sysRoleDto.Create_by,
|
||||
Create_time = DateTime.Now
|
||||
};
|
||||
sysRoleMenus.Add(rm);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user