Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/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,
@@ -243,7 +337,7 @@

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

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