From 75f3b34cc820f126197dd84691e61ccfdaeaa3bd Mon Sep 17 00:00:00 2001 From: Argo-MacBookPro Date: Fri, 2 Nov 2018 19:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9AUs?= =?UTF-8?q?er=E7=A7=BB=E9=99=A4Proc=5FRejectUsers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.DataAccess.MySQL/User.cs | 40 ----------------------------- Bootstrap.DataAccess.SQLite/User.cs | 40 ----------------------------- Bootstrap.DataAccess/User.cs | 32 +++++++++++++++++++---- 3 files changed, 27 insertions(+), 85 deletions(-) diff --git a/Bootstrap.DataAccess.MySQL/User.cs b/Bootstrap.DataAccess.MySQL/User.cs index 2a7f89b3..338458ea 100644 --- a/Bootstrap.DataAccess.MySQL/User.cs +++ b/Bootstrap.DataAccess.MySQL/User.cs @@ -1,6 +1,5 @@ using Bootstrap.Security; using Longbow.Data; -using Longbow.Security.Cryptography; using System; using System.Collections.Generic; using System.Data; @@ -14,45 +13,6 @@ namespace Bootstrap.DataAccess.MySQL /// public class User : DataAccess.User { - /// - /// - /// - /// - /// - /// - /// - public override bool RejectUser(string id, string rejectBy) - { - var ret = false; - using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) - { - try - { - using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, $"insert into RejectUsers (UserName, DisplayName, RegisterTime, RejectedBy, RejectedTime, RejectedReason) select UserName, DisplayName, Registertime, '{rejectBy}', now(), '未填写' from Users where ID = {id}")) - { - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from UserRole where UserId = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from UserGroup where UserId = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from users where ID = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - transaction.CommitTransaction(); - ret = true; - } - } - catch (Exception ex) - { - transaction.RollbackTransaction(); - throw ex; - } - } - return ret; - } /// /// 通过角色ID保存当前授权用户（插入） /// diff --git a/Bootstrap.DataAccess.SQLite/User.cs b/Bootstrap.DataAccess.SQLite/User.cs index bf8ea11d..7f1cee07 100644 --- a/Bootstrap.DataAccess.SQLite/User.cs +++ b/Bootstrap.DataAccess.SQLite/User.cs @@ -1,6 +1,5 @@ using Bootstrap.Security; using Longbow.Data; -using Longbow.Security.Cryptography; using System; using System.Collections.Generic; using System.Data; @@ -14,45 +13,6 @@ namespace Bootstrap.DataAccess.SQLite /// public class User : DataAccess.User { - /// - /// - /// - /// - /// - /// - /// - public override bool RejectUser(string id, string rejectBy) - { - var ret = false; - using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) - { - try - { - using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, $"insert into RejectUsers (UserName, DisplayName, RegisterTime, RejectedBy, RejectedTime, RejectedReason) select UserName, DisplayName, Registertime, '{rejectBy}', datetime('now', 'localtime'), '未填写' from Users where ID = {id}")) - { - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from UserRole where UserId = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from UserGroup where UserId = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - cmd.CommandText = $"delete from users where ID = {id}"; - DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); - - transaction.CommitTransaction(); - ret = true; - } - } - catch (Exception ex) - { - transaction.RollbackTransaction(); - throw ex; - } - } - return ret; - } /// /// 通过角色ID保存当前授权用户（插入） /// diff --git a/Bootstrap.DataAccess/User.cs b/Bootstrap.DataAccess/User.cs index efbe78fd..c33da9df 100644 --- a/Bootstrap.DataAccess/User.cs +++ b/Bootstrap.DataAccess/User.cs @@ -299,12 +299,34 @@ namespace Bootstrap.DataAccess public virtual bool RejectUser(string id, string rejectBy) { var ret = false; - using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.StoredProcedure, "Proc_RejectUsers")) + using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) { - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@id", id)); - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@rejectedBy", rejectBy)); - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@rejectedReason", "未填写")); - ret = DbAccessManager.DBAccess.ExecuteNonQuery(cmd) == -1; + try + { + using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, $"insert into RejectUsers (UserName, DisplayName, RegisterTime, RejectedBy, RejectedTime, RejectedReason) select UserName, DisplayName, Registertime, '{rejectBy}', @RejectTime, '未填写' from Users where ID = {id}")) + { + cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@RejectTime", DateTime.Now, DbType.DateTime)); + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + cmd.Parameters.Clear(); + cmd.CommandText = $"delete from UserRole where UserId = {id}"; + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + cmd.CommandText = $"delete from UserGroup where UserId = {id}"; + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + cmd.CommandText = $"delete from users where ID = {id}"; + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + transaction.CommitTransaction(); + ret = true; + } + } + catch (Exception ex) + { + transaction.RollbackTransaction(); + throw ex; + } } return ret; }