更新优化

helongyang

2025-07-25 a8e42e164def74dc212d79a43d3049921501ebe2

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs

@@ -15,6 +15,8 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.System;
using WIDESEA_SystemRepository;
using WIDESEA_Core.Helper;
using WIDESEA_Core.HostedService;

namespace WIDESEA_SystemService
{
@@ -35,6 +37,98 @@
            _RoleAuthRepository = roleAuthRepository;
        }

        public override WebResponseContent AddData(SaveModel saveModel)
        {
            string authorityScope = saveModel.MainData["authorityScope"].ToString() ?? "";
            Sys_Role role = saveModel.MainData.DicToModel<Sys_Role>();
            if (BaseDal.QueryFirst(x => x.RoleName == role.RoleName) != null)
            {
                return WebResponseContent.Instance.Error($"角色名重复");
            }
            List<Dt_Warehouse> warehouses = BaseDal.Db.Queryable<Dt_Warehouse>().Where(x => true).ToList();
            List<Sys_RoleDataPermission> roleDataPermissions = new List<Sys_RoleDataPermission>();
            if (!string.IsNullOrEmpty(authorityScope))
            {
                string[] scopes = authorityScope.Split(',');
                foreach (string scope in scopes)
                {
                    Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == Convert.ToInt32(scope));
                    if (warehouse != null)
                    {
                        roleDataPermissions.Add(new Sys_RoleDataPermission
                        {
                            WarehouseId = warehouse.WarehouseId,
                            WarehouseName = warehouse.WarehouseName,
                            RoleName = role.RoleName
                        });
                    }
                }
            }

            int roleId = BaseDal.AddData(role);
            if (roleDataPermissions.Count > 0)
            {
                roleDataPermissions.ForEach(x => { x.RoleId = roleId; });
                BaseDal.Db.Insertable(roleDataPermissions).ExecuteCommand();
            }

            PermissionDataHostService.UserRoles = PermissionDataHostService.GetUserRoles(Db);

            return WebResponseContent.Instance.OK();
        }

        public override WebResponseContent UpdateData(SaveModel saveModel)
        {
            string authorityScope = saveModel.MainData["authorityScope"].ToString() ?? "";
            Sys_Role role = saveModel.MainData.DicToModel<Sys_Role>();
            if (BaseDal.QueryFirst(x => x.RoleId == role.RoleId) == null)
            {
                return WebResponseContent.Instance.Error($"未找到该数据");
            }
            List<Dt_Warehouse> warehouses = BaseDal.Db.Queryable<Dt_Warehouse>().Where(x => true).ToList();

            List<Sys_RoleDataPermission> oldDatas = BaseDal.Db.Queryable<Sys_RoleDataPermission>().Where(x => x.RoleId == role.RoleId).ToList();
            List<Sys_RoleDataPermission> roleDataPermissions = new List<Sys_RoleDataPermission>();
            if (!string.IsNullOrEmpty(authorityScope))
            {
                string[] scopes = authorityScope.Split(',');
                foreach (string scope in scopes)
                {
                    Sys_RoleDataPermission? oldData = oldDatas.FirstOrDefault(x => x.WarehouseId == Convert.ToInt32(scope));
                    if (oldData == null)
                    {
                        Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == Convert.ToInt32(scope));
                        if (warehouse != null)
                        {
                            roleDataPermissions.Add(new Sys_RoleDataPermission
                            {
                                WarehouseId = warehouse.WarehouseId,
                                WarehouseName = warehouse.WarehouseName,
                                RoleName = role.RoleName
                            });
                        }
                    }
                    else
                    {
                        oldDatas.Remove(oldData);
                    }
                }
            }

            roleDataPermissions.ForEach(x => { x.RoleId = role.RoleId; });
            BaseDal.Db.Insertable(roleDataPermissions).ExecuteCommand();
            BaseDal.Db.Deleteable(oldDatas).ExecuteCommand();

            PermissionDataHostService.UserRoles = PermissionDataHostService.GetUserRoles(Db);

            return WebResponseContent.Instance.OK();
        }

        public List<int> GetAllChildrenRoleId(int roleId)
        {
            return GetAllChildren(roleId).Select(x => x.Id).ToList();
        }

        public List<RoleNodes> GetAllChildren(int roleId)
        {
            if (roleId <= 0) return new List<RoleNodes>() { };
@@ -45,7 +139,7 @@
            return list;
        }

        public  List<RoleNodes> GetAllRoleId()
        public List<RoleNodes> GetAllRoleId()
        {
            List<RoleNodes> roles = BaseDal.QueryData().Select(s => new RoleNodes() { Id = s.RoleId, ParentId = s.ParentId, RoleName = s.RoleName }).ToList();

@@ -110,7 +204,7 @@
            //获取用户权限
            List<Permissions> permissions = _MenuRepository.GetPermissions(roleId);
            //权限用户权限查询所有的菜单信息
            List<MenuDTO> menus =  _MenuService.GetUserMenuList(roleId);
            List<MenuDTO> menus = _MenuService.GetUserMenuList(roleId);
            //获取当前用户权限如:(Add,Search)对应的显示文本信息如:Add：添加，Search:查询
            var data = menus.Select(x => new
            {
@@ -156,7 +250,7 @@
            List<MenuDTO> menus = _MenuService.GetUserMenuListPDA(roleId);

            //获取当前用户权限如:(Add,Search)对应的显示文本信息如:Add：添加，Search:查询
            var data = menus.Where(x => x.MenuType==1).Select(x => new
            var data = menus.Where(x => x.MenuType == 1).Select(x => new
            {
                Id = x.MenuId,
                Pid = x.ParentId,
@@ -184,9 +278,11 @@
                //当前用户的权限
                List<Permissions> permissions = _MenuRepository.GetPermissions(App.User.RoleId);

                List<int> menuIds = _MenuRepository.QueryData(x => x.MenuId, x => x.MenuType == 1);

                List<int> originalMeunIds = new List<int>();
                //被分配角色的权限
                List<Sys_RoleAuth> roleAuths = _RoleAuthRepository.QueryData(x => x.RoleId == roleId);
                List<Sys_RoleAuth> roleAuths = _RoleAuthRepository.QueryData(x => x.RoleId == roleId && menuIds.Contains(x.MenuId));
                List<Sys_RoleAuth> updateAuths = new List<Sys_RoleAuth>();
                foreach (UserPermissionDTO x in userPermissions)
                {
@@ -239,11 +335,104 @@
                    x.AuthValue = "";
                });
                //将取消的权限设置为""
                _RoleAuthRepository.UpdateData(delAuths);
                _RoleAuthRepository.DeleteData(delAuths);

                int addCount = updateAuths.Where(x => x.AuthId <= 0).Count();
                int updateCount = updateAuths.Where(x => x.AuthId > 0).Count();
                

                string _version = DateTime.Now.ToString("yyyyMMddHHMMssfff");


                content.OK($"保存成功：新增加配菜单权限{addCount}条,更新菜单{updateCount}条,删除权限{delAuths.Count}条");
            }
            catch (Exception ex)
            {
                message = "异常信息：" + ex.Message + ex.StackTrace + ",";
            }

            return content;
        }

        /// <summary>
        /// ä¿å­˜è§’色权限
        /// </summary>
        /// <param name="userPermissions"></param>
        /// <param name="roleId"></param>
        /// <returns></returns>
        public WebResponseContent SavePermissionPDA(List<UserPermissionDTO> userPermissions, int roleId)
        {
            WebResponseContent content = new WebResponseContent();
            string message = "";
            try
            {
                if (!GetAllChildren(App.User.RoleId).Exists(x => x.Id == roleId))
                    return WebResponseContent.Instance.Error("没有权限修改此角色的权限信息");
                //当前用户的权限
                List<Permissions> permissions = _MenuRepository.GetPermissions(App.User.RoleId);

                List<int> originalMeunIds = new List<int>();

                List<int> menuIds = _MenuRepository.QueryData(x => x.MenuId, x => x.MenuType == 1);

                //被分配角色的权限
                List<Sys_RoleAuth> roleAuths = _RoleAuthRepository.QueryData(x => x.RoleId == roleId && menuIds.Contains(x.MenuId));
                List<Sys_RoleAuth> updateAuths = new List<Sys_RoleAuth>();
                foreach (UserPermissionDTO x in userPermissions)
                {
                    Permissions per = permissions.FirstOrDefault(p => p.MenuId == x.Id);
                    //不能分配超过当前用户的权限
                    if (per == null) continue;
                    //per.UserAuthArr.Contains(a.Value)校验权限范围
                    string[] arr = x.Actions == null || x.Actions.Count == 0
                      ? new string[0]
                      : x.Actions.Where(a => per.UserAuthArr.Contains(a.Value))
                      .Select(s => s.Value).ToArray();

                    //如果当前权限没有分配过，设置Auth_Id默认为0，表示新增的权限
                    var auth = roleAuths.Where(r => r.MenuId == x.Id).Select(s => new { s.AuthId, s.AuthValue, s.MenuId }).FirstOrDefault();
                    string newAuthValue = string.Join(",", arr);
                    //权限没有发生变化则不处理
                    if (auth == null || auth.AuthValue != newAuthValue)
                    {
                        updateAuths.Add(new Sys_RoleAuth()
                        {
                            RoleId = roleId,
                            MenuId = x.Id,
                            AuthValue = string.Join(",", arr),
                            AuthId = auth == null ? 0 : auth.AuthId,
                            ModifyDate = DateTime.Now,
                            Modifier = App.User.UserName,
                            CreateDate = DateTime.Now,
                            Creater = App.User.UserName
                        });
                    }
                    else
                    {
                        originalMeunIds.Add(auth.MenuId);
                    }

                }
                //更新权限
                _RoleAuthRepository.UpdateData(updateAuths);
                //新增的权限
                _RoleAuthRepository.AddData(updateAuths);

                //获取权限取消的权限
                int[] authIds = roleAuths.Where(x => userPermissions.Select(u => u.Id)
                 .ToList().Contains(x.MenuId) || originalMeunIds.Contains(x.MenuId))
                .Select(s => s.AuthId)
                .ToArray();
                List<Sys_RoleAuth> delAuths = roleAuths.Where(x => x.AuthValue != "" && !authIds.Contains(x.AuthId)).ToList();
                delAuths.ForEach(x =>
                {
                    x.AuthValue = "";
                });
                //将取消的权限设置为""
                _RoleAuthRepository.DeleteData(delAuths);

                int addCount = updateAuths.Where(x => x.AuthId <= 0).Count();
                int updateCount = updateAuths.Where(x => x.AuthId > 0).Count();

                string _version = DateTime.Now.ToString("yyyyMMddHHMMssfff");