diff --git a/Bootstrap.DataAccess.SQLite/Menu.cs b/Bootstrap.DataAccess.SQLite/Menu.cs index 7ab52bb7..1982ca32 100644 --- a/Bootstrap.DataAccess.SQLite/Menu.cs +++ b/Bootstrap.DataAccess.SQLite/Menu.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; using System.Linq; namespace Bootstrap.DataAccess.SQLite @@ -21,28 +20,40 @@ namespace Bootstrap.DataAccess.SQLite { bool ret = false; var ids = string.Join(",", value); - using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.StoredProcedure, "Proc_DeleteMenus")) + using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) { - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@ids", ids)); - ret = DbAccessManager.DBAccess.ExecuteNonQuery(cmd) == -1; + using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, $"delete from NavigationRole where NavigationID in ({ids})")) + { + try + { + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + cmd.CommandText = $"delete from Navigations where ID in ({ids})"; + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + + transaction.CommitTransaction(); + CacheCleanUtility.ClearCache(menuIds: value); + ret = true; + } + catch (Exception ex) + { + transaction.RollbackTransaction(); + throw ex; + } + } } - CacheCleanUtility.ClearCache(menuIds: value); return ret; } /// /// /// 通过角色ID保存当前授权菜单 /// - /// + /// /// /// - public override bool SaveMenusByRoleId(int id, IEnumerable menuIds) + public override bool SaveMenusByRoleId(int roleId, IEnumerable menuIds) { bool ret = false; - DataTable dt = new DataTable(); - dt.Columns.Add("RoleID", typeof(int)); - dt.Columns.Add("NavigationID", typeof(int)); - menuIds.ToList().ForEach(menuId => dt.Rows.Add(id, menuId)); using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) { try @@ -51,19 +62,16 @@ namespace Bootstrap.DataAccess.SQLite string sql = "delete from NavigationRole where RoleID=@RoleID"; using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql)) { - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@RoleID", id)); DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); //批插入菜单角色表 - using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction)) + menuIds.ToList().ForEach(mId => { - bulk.DestinationTableName = "NavigationRole"; - bulk.ColumnMappings.Add("RoleID", "RoleID"); - bulk.ColumnMappings.Add("NavigationID", "NavigationID"); - bulk.WriteToServer(dt); - transaction.CommitTransaction(); - } + cmd.CommandText = $"Insert Into NavigationRole (NavigationID, RoleID) Values ( {mId}, {roleId})"; + DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); + }); + transaction.CommitTransaction(); } - CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List() { id }); + CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List() { roleId }); ret = true; } catch (Exception ex) diff --git a/Bootstrap.DataAccess/Menu.cs b/Bootstrap.DataAccess/Menu.cs index f547a2ae..6010349f 100644 --- a/Bootstrap.DataAccess/Menu.cs +++ b/Bootstrap.DataAccess/Menu.cs @@ -104,25 +104,24 @@ namespace Bootstrap.DataAccess /// /// 通过角色ID保存当前授权菜单 /// - /// + /// /// /// - public virtual bool SaveMenusByRoleId(int id, IEnumerable menuIds) + public virtual bool SaveMenusByRoleId(int roleId, IEnumerable menuIds) { bool ret = false; DataTable dt = new DataTable(); dt.Columns.Add("RoleID", typeof(int)); dt.Columns.Add("NavigationID", typeof(int)); - menuIds.ToList().ForEach(menuId => dt.Rows.Add(id, menuId)); + menuIds.ToList().ForEach(menuId => dt.Rows.Add(roleId, menuId)); using (TransactionPackage transaction = DbAccessManager.DBAccess.BeginTransaction()) { try { //删除菜单角色表该角色所有的菜单 - string sql = "delete from NavigationRole where RoleID=@RoleID"; + string sql = $"delete from NavigationRole where RoleID = {roleId}"; using (DbCommand cmd = DbAccessManager.DBAccess.CreateCommand(CommandType.Text, sql)) { - cmd.Parameters.Add(DbAccessManager.DBAccess.CreateParameter("@RoleID", id)); DbAccessManager.DBAccess.ExecuteNonQuery(cmd, transaction); //批插入菜单角色表 using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction)) @@ -134,7 +133,7 @@ namespace Bootstrap.DataAccess transaction.CommitTransaction(); } } - CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List() { id }); + CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: new List() { roleId }); ret = true; } catch (Exception ex)