ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heshaofeng
6 天以前 375ace27ad6afbc3c83d92add0fb5a0347a6edbf 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_RoleService.cs


@@ -187,12 +187,11 @@


                //当前用户的权限


                List<Permissions> permissions = _MenuService.GetPermissions(App.User.RoleId);




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




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


                //被分配角色的权限


                List<Sys_RoleAuth> roleAuths = _RoleAuthService.Repository.QueryData(x => x.RoleId == roleId && menuIds.Contains(x.MenuId));


                List<Sys_RoleAuth> roleAuths = _RoleAuthService.Repository.QueryData(x => x.RoleId == roleId);


                List<Sys_RoleAuth> updateAuths = new List<Sys_RoleAuth>();


                List<Sys_RoleAuth> addAuths = new List<Sys_RoleAuth>();


                foreach (UserPermissionDTO x in userPermissions)


                {


                    Permissions per = permissions.FirstOrDefault(p => p.MenuId == x.Id);


@@ -208,7 +207,21 @@


                    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)


                    if (auth == null)


                    {


                        addAuths.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 if (auth.AuthValue != newAuthValue)


                    {


                        updateAuths.Add(new Sys_RoleAuth()


                        {


@@ -231,7 +244,7 @@


                //更新权限


                _RoleAuthService.Repository.UpdateData(updateAuths);


                //新增的权限


                _RoleAuthService.Repository.AddData(updateAuths);


                _RoleAuthService.Repository.AddData(addAuths);




                //获取权限取消的权限


                int[] authIds = roleAuths.Where(x => userPermissions.Select(u => u.Id)