diff --git a/04.系统编码/BLL/UserBLL.cs b/04.系统编码/BLL/UserBLL.cs index cce3afe..eb4aab1 100644 --- a/04.系统编码/BLL/UserBLL.cs +++ b/04.系统编码/BLL/UserBLL.cs @@ -23,6 +23,7 @@ namespace Pingchuan.BeijingSafeguard.BLL user.Enabled = 1; user.ComputeCount = 0; user.LastComputeTime = null; + user.LoginCount = 0; user.LastLoginTime = null; user.CreateTime = DateTime.Now; return UserDAL.Add(user); diff --git a/04.系统编码/DAL/UserDAL.cs b/04.系统编码/DAL/UserDAL.cs index 26005a6..19609f8 100644 --- a/04.系统编码/DAL/UserDAL.cs +++ b/04.系统编码/DAL/UserDAL.cs @@ -46,10 +46,10 @@ namespace Pingchuan.BeijingSafeguard.DAL public static Pagination Query(int orgId, int pageIndex, int pageSize) { - string condition = orgId == 0 ? string.Empty : $"where u.org_id = {orgId}"; + string condition = orgId == 0 ? string.Empty : $"and u.org_id = {orgId}"; string sql = $@"select u.*, o.name org_name from users u left join orgs o on o.id = u.org_id - {condition} + where is_sa <> 1 {condition} order by u.create_time desc"; Page users = db.Page(pageIndex, pageSize, sql); return Pagination.FromPage(users); diff --git a/04.系统编码/Model/User.cs b/04.系统编码/Model/User.cs index 40c7664..c323a6f 100644 --- a/04.系统编码/Model/User.cs +++ b/04.系统编码/Model/User.cs @@ -22,6 +22,9 @@ namespace Pingchuan.BeijingSafeguard.Model [Column("real_name")] public string RealName { set; get; } + [Column("is_sa")] + public int IsSa { set; get; } + [Column("login_name")] public string LoginName { set; get; }