暂存

Areas/Api/Controllers/SysAdminController.cs

@@ -12,6 +12,7 @@ using Library;
 using LitJson;
 using Microsoft.AspNetCore.Authorization;
 using MySystem.Service.Bs;
+using System.Linq;
 
 namespace MySystem.Areas.Api.Controllers.v1
 {
@@ -112,5 +113,176 @@ namespace MySystem.Areas.Api.Controllers.v1
 
         #endregion
 
+
+
+        #region 权限树
+        public JsonResult AuthsTree(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData jsonObj = JsonMapper.ToObject(value);
+            Dictionary<string, object> obj = new Dictionary<string, object>(); //返回字段
+            var anths = BaseClass.GetRightJson();
+            obj.Add("AuthsTree", anths); //主token,用于刷新apiToken
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = obj });
+        }
+
+        #endregion
+
+
+        #region 系统管理-系统用户管理-系统用户信息列表
+        [Authorize]
+        public JsonResult SysAdminList(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = SysAdminListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        private List<Dictionary<string, object>> SysAdminListDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string AdminName = data["AdminName"].ToString(); //角色名称
+            string RealName = data["RealName"].ToString(); //名称
+            string RoleId = data["RoleId"].ToString(); //角色Id
+            string LastLoginDate = data["LastLoginDate"].ToString(); //最后登录时间
+            int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            string condition = "";
+            if (!string.IsNullOrEmpty(data["AdminName"].ToString()))
+            {
+                condition += " and AdminName like '%" + AdminName + "%'";
+            }
+            if (!string.IsNullOrEmpty(data["RealName"].ToString()))
+            {
+                condition += " and RealName like '%" + RealName + "%'";
+            }
+            if (!string.IsNullOrEmpty(data["RoleId"].ToString()))
+            {
+                condition += " and Role='" + RoleId + "'";
+            }
+            if (!string.IsNullOrEmpty(data["LastLoginDate"].ToString()))
+            {
+                string[] datelist = LastLoginDate.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and LastLoginDate>='" + start + " 00:00:00' and LastLoginDate<='" + end + " 23:59:59'";
+            }
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = SysAdminService.List(relationData, condition, out count, pageNum, pageSize);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", int.Parse(subdata["Id"].ToString())); //Id
+                curData.Add("AdminName", subdata["AdminName"].ToString()); //用户名
+                curData.Add("RealName", subdata["RealName"].ToString()); //名称
+                curData.Add("RoleId", int.Parse(subdata["Role"].ToString())); //角色
+                curData.Add("LastLoginDate", subdata["LastLoginDate"] == null ? "" : DateTime.Parse(subdata["LastLoginDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //最后登录时间
+                dataList.Add(curData);
+            }
+            Other.Add("Count", count); //总数
+            return dataList;
+        }
+        #endregion
+
+
+        #region 系统管理-系统用户管理-添加系统用户信息
+        [Authorize]
+        public JsonResult AddSysAdminUserInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = AddSysAdminUserInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson AddSysAdminUserInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string AdminName = data["AdminName"].ToString(); //用户名
+            string RealName = data["RealName"].ToString(); //名称
+            string PassWord = data["PassWord"].ToString(); //密码
+            string RoleId = data["RoleId"].ToString(); //角色
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("AdminName", AdminName); //用户名
+            fields.Add("RealName", RealName); //名称
+            fields.Add("Password", function.MD5_32(PassWord)); //密码
+            fields.Add("Role", RoleId); //角色
+            var Id = int.Parse(SysAdminService.Add(fields).Data.ToString());
+            if (Id > 0)
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = Id };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = Id };
+            }
+        }
+        #endregion
+
+
+        #region 系统管理-系统用户管理-编辑系统用户信息
+        [Authorize]
+        public JsonResult EditSysAdminUserInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = EditSysAdminUserInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson EditSysAdminUserInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int SysAdminId = int.Parse(data["SysAdminId"].ToString()); //系统用户Id
+            string AdminName = data["AdminName"].ToString(); //用户名
+            string RealName = data["RealName"].ToString(); //名称
+            string PassWord = data["PassWord"].ToString(); //密码
+            string RoleId = data["RoleId"].ToString(); //角色
+            var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.Id == SysAdminId) ?? new SysAdmin();
+            if (sysAdmin.Id > 0)
+            {
+                if (!string.IsNullOrEmpty(AdminName))
+                {
+                    sysAdmin.AdminName = AdminName;
+                }
+                if (!string.IsNullOrEmpty(RealName))
+                {
+                    sysAdmin.RealName = RealName;
+                }
+                if (!string.IsNullOrEmpty(PassWord))
+                {
+                    sysAdmin.Password = function.MD5_32(PassWord);
+                }
+                if (!string.IsNullOrEmpty(data["RoleId"].ToString()) && RoleId != sysAdmin.Role)
+                {
+                    sysAdmin.Role = RoleId;
+                }
+            }
+            bsdb.SaveChanges();
+            return new AppResultJson() { Status = "1", Info = "成功" };
+        }
+        #endregion
+
+
+        #region 系统管理-系统用户管理-删除系统用户信息
+        [Authorize]
+        public JsonResult DeleteSysAdminUserInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = DeleteSysAdminUserInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson DeleteSysAdminUserInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int SysAdminId = int.Parse(data["SysAdminId"].ToString()); //系统用户Id
+            SysAdminService.Delete(SysAdminId);
+            return new AppResultJson() { Status = "1", Info = "成功" };
+        }
+        #endregion
+
     }
 }

Areas/Api/Controllers/SysAdminRoleController.cs

@@ -0,0 +1,156 @@
+/*
+ * 后台角色
+ */
+
+using System;
+using System.Web;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using MySystem.Models.Bs;
+using Library;
+using LitJson;
+using Microsoft.AspNetCore.Authorization;
+using MySystem.Service.Bs;
+using System.Linq;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class SysAdminRoleController : BaseController
+    {
+        public SysAdminRoleController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+        #region 系统管理-角色管理-角色列表
+        [Authorize]
+        public JsonResult SysAdminRoleList(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = SysAdminRoleListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        private List<Dictionary<string, object>> SysAdminRoleListDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Name = data["Name"].ToString(); //角色名称
+            int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            string condition = "";
+            if (!string.IsNullOrEmpty(data["Name"].ToString()))
+            {
+                condition += " and Name like '%" + Name + "%'";
+            }
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = SysAdminRoleService.List(relationData, condition, out count, pageNum, pageSize);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", int.Parse(subdata["Id"].ToString())); //Id
+                curData.Add("Name", subdata["Name"].ToString()); //角色名称
+                curData.Add("Details", subdata["Details"].ToString()); //描述
+                dataList.Add(curData);
+            }
+            Other.Add("Count", count); //总数
+            return dataList;
+        }
+        #endregion
+
+
+        #region 系统管理-角色管理-添加系统角色信息
+        [Authorize]
+        public JsonResult AddSysAdminRoleInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = AddSysAdminRoleInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson AddSysAdminRoleInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Name = data["Name"].ToString(); //角色名称
+            string Details = data["Details"].ToString(); //详情
+            string RightInfo = data["RightInfo"].ToString(); //权限字符串
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("Name", Name); //角色名称
+            fields.Add("Details", Details); //详情
+            fields.Add("RightInfo", RightInfo); //权限字符串
+            var Id = int.Parse(SysAdminRoleService.Add(fields).Data.ToString());
+            if (Id > 0)
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = Id };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = Id };
+            }
+        }
+        #endregion
+
+
+        #region 系统管理-角色管理-编辑系统角色信息
+        [Authorize]
+        public JsonResult EditSysAdminRoleInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = EditSysAdminRoleInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson EditSysAdminRoleInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int SysAdminRoleId = int.Parse(data["SysAdminRoleId"].ToString()); //角色Id
+            string Name = data["Name"].ToString(); //角色名称
+            string Details = data["Details"].ToString(); //详情
+            string RightInfo = data["RightInfo"].ToString(); //权限字符串
+            var sysAdminRole = bsdb.SysAdminRole.FirstOrDefault(m => m.Id == SysAdminRoleId) ?? new SysAdminRole();
+            if (sysAdminRole.Id > 0)
+            {
+                if (!string.IsNullOrEmpty(Name))
+                {
+                    sysAdminRole.Name = Name;
+                }
+                if (!string.IsNullOrEmpty(Details))
+                {
+                    sysAdminRole.Details = Details;
+                }
+                if (!string.IsNullOrEmpty(RightInfo))
+                {
+                    sysAdminRole.RightInfo = RightInfo;
+                }
+            }
+            bsdb.SaveChanges();
+            return new AppResultJson() { Status = "1", Info = "成功" };
+        }
+        #endregion
+
+
+        #region 系统管理-角色管理-删除系统角色信息
+        [Authorize]
+        public JsonResult DeleteSysAdminRoleInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = DeleteSysAdminRoleInfoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson DeleteSysAdminRoleInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int SysAdminRoleId = int.Parse(data["SysAdminRoleId"].ToString()); //角色Id
+            SysAdminRoleService.Delete(SysAdminRoleId);
+            return new AppResultJson() { Status = "1", Info = "成功" };
+        }
+        #endregion
+
+    }
+}

Areas/Api/Controllers/TestController.cs

@@ -12,6 +12,7 @@ using Library;
 using LitJson;
 using Microsoft.AspNetCore.Authorization;
 using MySystem.Service.Bs;
+using System.Linq;
 
 namespace MySystem.Areas.Api.Controllers.v1
 {
@@ -35,47 +36,55 @@ namespace MySystem.Areas.Api.Controllers.v1
         public JsonResult List(string value)
         {
             value = PublicFunction.DesDecrypt(value);
-            JsonData data = JsonMapper.ToObject(value);
-            string userName = "root"; //账号
-            string pwd = "123456"; //密码
-            SysAdmin sys = SysAdminService.Query(userName, function.MD5_32(pwd));
-            if (sys.Id == 0)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "账号或密码不正确" });
-            }
-            int RoleId = int.Parse(function.CheckInt(sys.Role));
-            SysAdminRole Role = SysAdminRoleService.Query(RoleId);
-            string RightInfo = function.CheckNull(Role.RightInfo);
-            Dictionary<string, object> obj = new Dictionary<string, object>(); //返回字段
-            obj.Add("rightList", new AdminRightList().GetRight(sys.Role, RightInfo)); //权限列表
-            obj.Add("apiToken", PublicFunction.AppToken(sys.AdminName)); //后台所有接口API所需的token
-            obj.Add("apiTokenExpiredDate", DateTime.Now.AddDays(10).ToString("yyyy-MM-dd HH:mm:ss"));
-            string token = dbconn.Encrypt3DES(sys.Id.ToString() + "-" + function.ConvertDateTimeInt(DateTime.Now));
-            RefreshTokens check = RefreshTokensService.Query(sys.Id);
-            if (check.UserId == 0)
+            JsonData jsonObj = JsonMapper.ToObject(value);
+            // Dictionary<string, object> obj = new Dictionary<string, object>(); //返回字段
+            // var anths = BaseClass.GetRightJson();
+            // obj.Add("AuthsTree", anths); //主token,用于刷新apiToken
+
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = SysAdminService.List(relationData, "", out count, 1, 999);
+            foreach (Dictionary<string, object> subdata in source)
             {
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("UserId", sys.Id);
-                Fields.Add("ExpiredDate", DateTime.Now.AddDays(10));
-                Fields.Add("RefreshToken", token);
-                RefreshTokensService.Add(Fields);
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("AdminName", subdata["AdminName"].ToString()); //用户名
+                curData.Add("RealName", subdata["RealName"].ToString()); //名称
+                curData.Add("RoleId", subdata["Role"].ToString()); //角色
+                curData.Add("LastLoginDate", subdata["LastLoginDate"] == null ? "" : DateTime.Parse(subdata["LastLoginDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //最后登录时间
+                dataList.Add(curData);
             }
-            else
+            Other.Add("Count", count); //总数
+
+            int SysAdminId = 6; //系统用户Id
+            string AdminName = "AHHA"; //用户名
+            string RealName = "ABBA"; //名称
+            string PassWord = "123456"; //密码
+            string RoleId = "1"; //角色
+            var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.Id == SysAdminId) ?? new SysAdmin();
+            if (sysAdmin.Id > 0)
             {
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("ExpiredDate", DateTime.Now.AddDays(10));
-                Fields.Add("RefreshToken", token);
-                RefreshTokensService.Edit(Fields, sys.Id);
+                if (!string.IsNullOrEmpty(AdminName))
+                {
+                    sysAdmin.AdminName = AdminName;
+                }
+                if (!string.IsNullOrEmpty(RealName))
+                {
+                    sysAdmin.RealName = RealName;
+                }
+                if (!string.IsNullOrEmpty(PassWord))
+                {
+                    sysAdmin.Password = function.MD5_32(PassWord);
+                }
+                if (!string.IsNullOrEmpty(RoleId) && RoleId != sysAdmin.Role)
+                {
+                    sysAdmin.Role = RoleId;
+                }
             }
-            List<string> roles = new List<string>();
-            roles.Add(sys.Role);
-            obj.Add("roles", roles);
-            obj.Add("realName", sys.RealName);
-            obj.Add("refreshToken", token); //主token,用于刷新apiToken
-            AppConfig.LoginSession.sysId = sys.Id;
-            AppConfig.LoginSession.sysAdminName = sys.AdminName;
-            AppConfig.LoginSession.sysRealName = sys.RealName;
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = obj });
+            bsdb.SaveChanges();
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
         }
 
         #endregion

Service/Bs/SysAdminRoleService.cs

@@ -161,7 +161,7 @@ namespace MySystem.Service.Bs
                 }
 
             }
-            int Id = new DbService(AppConfig.Base.dbTables, _conn).Add("SysAdminRole", fields, 0);
+            int Id = new DbService(AppConfig.Base.bsTables, _conn).Add("SysAdminRole", fields, 0);
             return new AppResultJson() { Status = "1", Data = Id };
         }
 
@@ -184,7 +184,7 @@ namespace MySystem.Service.Bs
                 }
 
             }
-            new DbService(AppConfig.Base.dbTables, _conn).Edit("SysAdminRole", fields, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Edit("SysAdminRole", fields, Id);
             return new AppResultJson() { Status = "1", Data = Id };
         }
 
@@ -196,7 +196,7 @@ namespace MySystem.Service.Bs
         {
             Dictionary<string, object> fields = new Dictionary<string, object>();
             fields.Add("Status", -1);
-            new DbService(AppConfig.Base.dbTables, _conn).Edit("SysAdminRole", fields, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Edit("SysAdminRole", fields, Id);
         }
 
         /// <summary>
@@ -205,7 +205,7 @@ namespace MySystem.Service.Bs
         /// <param name="Id">主键Id</param>
         public static void Delete(int Id)
         {
-            new DbService(AppConfig.Base.dbTables, _conn).Delete("SysAdminRole", Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Delete("SysAdminRole", Id);
         }
 
         /// <summary>
@@ -215,7 +215,7 @@ namespace MySystem.Service.Bs
         /// <param name="Sort">排序序号</param>
         public static void Sort(int Id, int Sort)
         {
-            new DbService(AppConfig.Base.dbTables, _conn).Sort("SysAdminRole", Sort, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Sort("SysAdminRole", Sort, Id);
         }
 
         /// <summary>

Service/Bs/SysAdminService.cs

@@ -36,7 +36,7 @@ namespace MySystem.Service.Bs
             fields.Add("Role"); //角色
             fields.Add("LastLoginDate"); //最后登录时间
 
-            Dictionary<string, object> obj = new DbService(AppConfig.Base.dbTables, _conn).IndexData("SysAdmin", relationData, orderBy, page, limit, condition, fields);
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("SysAdmin", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             count = int.Parse(obj["count"].ToString());
             return diclist;
@@ -52,7 +52,7 @@ namespace MySystem.Service.Bs
             fields.Add("Role"); //角色
             fields.Add("LastLoginDate"); //最后登录时间
 
-            Dictionary<string, object> obj = new DbService(AppConfig.Base.dbTables, _conn).IndexData("SysAdmin", relationData, orderBy, page, limit, condition, fields);
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("SysAdmin", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
@@ -117,7 +117,7 @@ namespace MySystem.Service.Bs
             {
 
             }
-            int Id = new DbService(AppConfig.Base.dbTables, _conn).Add("SysAdmin", fields, 0);
+            int Id = new DbService(AppConfig.Base.bsTables, _conn).Add("SysAdmin", fields, 0);
             return new AppResultJson() { Status = "1", Data = Id };
         }
 
@@ -132,7 +132,7 @@ namespace MySystem.Service.Bs
             {
 
             }
-            new DbService(AppConfig.Base.dbTables, _conn).Edit("SysAdmin", fields, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Edit("SysAdmin", fields, Id);
             return new AppResultJson() { Status = "1", Data = Id };
         }
 
@@ -144,7 +144,7 @@ namespace MySystem.Service.Bs
         {
             Dictionary<string, object> fields = new Dictionary<string, object>();
             fields.Add("Status", -1);
-            new DbService(AppConfig.Base.dbTables, _conn).Edit("SysAdmin", fields, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Edit("SysAdmin", fields, Id);
         }
 
         /// <summary>
@@ -153,7 +153,7 @@ namespace MySystem.Service.Bs
         /// <param name="Id">主键Id</param>
         public static void Delete(int Id)
         {
-            new DbService(AppConfig.Base.dbTables, _conn).Delete("SysAdmin", Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Delete("SysAdmin", Id);
         }
 
         /// <summary>
@@ -163,7 +163,7 @@ namespace MySystem.Service.Bs
         /// <param name="Sort">排序序号</param>
         public static void Sort(int Id, int Sort)
         {
-            new DbService(AppConfig.Base.dbTables, _conn).Sort("SysAdmin", Sort, Id);
+            new DbService(AppConfig.Base.bsTables, _conn).Sort("SysAdmin", Sort, Id);
         }
 
         /// <summary>

Util/Base/BaseClass.cs

@@ -11,38 +11,42 @@ namespace MySystem
     public class BaseClass
     {
 
-        public Models.Bs.WebCMSEntities bsdb = new Models.Bs.WebCMSEntities();
+        public static Models.Bs.WebCMSEntities bsdb = new Models.Bs.WebCMSEntities();
 
-        #region 
-        public string GetRightJson()
+        #region 菜单权限json
+        /// <summary>
+        /// 菜单权限json
+        /// </summary>
+        /// <returns></returns>
+        public static string GetRightJson()
         {
             string result = "[";
             List<RightDic> list = bsdb.RightDic.ToList();
             List<RightDic> Level1 = list.Where(m => m.RightLevel == 1).ToList();
             foreach (RightDic sub1 in Level1)
             {
-                result += "{title: '" + sub1.Name + "', id: '" + sub1.Id + "', spread: false, children: [";
+                result += "{title: '" + sub1.Title + "',name: '" + sub1.Name + "', id: '" + sub1.Id + "', spread: false, children: [";
                 List<RightDic> Level2 = list.Where(m => m.RightLevel == 2 && m.Id.StartsWith(sub1.Id)).ToList();
                 if (Level2.Count > 0)
                 {
                     foreach (RightDic sub2 in Level2)
                     {
-                        result += "{title: '" + sub2.Name + "', id: '" + sub2.Id + "', spread: false, children: [";
+                        result += "{title: '" + sub2.Title + "',name: '" + sub2.Name + "', id: '" + sub2.Id + "', spread: false, children: [";
                         List<RightDic> Level3 = list.Where(m => m.RightLevel == 3 && m.Id.StartsWith(sub2.Id)).ToList();
                         if (Level3.Count > 0)
                         {
                             foreach (RightDic sub3 in Level3)
                             {
-                                result += "{title: '" + sub3.Name + "', id: '" + sub3.Id + "', spread: false, children: [";
+                                result += "{title: '" + sub3.Title + "',name: '" + sub3.Name + "', id: '" + sub3.Id + "', spread: false, children: [";
                                 string rightString = ForOperateRight(sub3.Id);
                                 if (!string.IsNullOrEmpty(rightString))
                                 {
                                     result += rightString;
                                 }
-                                else
-                                {
-                                    result += "{title: '基本权限', id: '" + sub3.Id + "_base'}";
-                                }
+                                // else
+                                // {
+                                //     result += "{title: '基本权限', id: '" + sub3.Id + "_base'}";
+                                // }
                                 result += "]},";
                             }
                             result = result.TrimEnd(',');
@@ -54,10 +58,10 @@ namespace MySystem
                             {
                                 result += rightString;
                             }
-                            else
-                            {
-                                result += "{title: '基本权限', id: '" + sub2.Id + "_base'}";
-                            }
+                            // else
+                            // {
+                            //     result += "{title: '基本权限', id: '" + sub2.Id + "_base'}";
+                            // }
                         }
                         result += "]},";
                     }
@@ -71,10 +75,10 @@ namespace MySystem
                     {
                         result += rightString;
                     }
-                    else
-                    {
-                        result += "{title: '基本权限', id: '" + sub1.Id + "_base'}";
-                    }
+                    // else
+                    // {
+                    //     result += "{title: '基本权限', id: '" + sub1.Id + "_base'}";
+                    // }
                 }
                 result += "]},";
             }
@@ -83,7 +87,7 @@ namespace MySystem
             return result;
         }
         //读取当前菜单有哪些权限
-        public string ForOperateRight(string Id)
+        public static string ForOperateRight(string Id)
         {
             string result = "";
             List<MenuRight> rights = bsdb.MenuRight.Where(m => m.MenuId.StartsWith(Id)).OrderBy(m => m.MenuId).ToList();