diff --git a/LMS.service/Service/OptionsService.cs b/LMS.service/Service/OptionsService.cs index 3df6cdf..384649d 100644 --- a/LMS.service/Service/OptionsService.cs +++ b/LMS.service/Service/OptionsService.cs @@ -207,7 +207,7 @@ namespace LMS.service.Service #region 获取指定的配置项 /// - /// 获取指定的配置项,需要判断权限 + /// 获取指定的配置项,只能获取不需要权限的 /// /// /// @@ -225,39 +225,48 @@ namespace LMS.service.Service Options? options = await _context.Options.FirstOrDefaultAsync(x => x.Key == optionsKey && (OptionCategory)category == x.Category) ?? throw new Exception("数据不存在"); - List roleIds = []; - if (userId != 0) + if (options.RoleIds != null && options.RoleIds.Count != 0) { - roleIds = await _userBasicDao.GetUserRoleIds(userId); - } - - // 数据存在 对比权限 - if (options.RoleIds.Count == 0) - { - // 不需要权限 直接返回 - return APIResponseModel.CreateSuccessResponseModel(_mapper.Map(options)); + return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction); } else { - // 需要判断权限 判断 roleIds 是不是有权限在 options.RoleIds 里面 - bool hasPermission = false; - foreach (var roleId in roleIds) - { - if (options.RoleIds.Contains(roleId)) - { - hasPermission = true; - break; - } - } - if (!hasPermission) - { - return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction); - } - else - { - return APIResponseModel.CreateSuccessResponseModel(_mapper.Map(options)); - } + return APIResponseModel.CreateSuccessResponseModel(_mapper.Map(options)); } + + //List roleIds = []; + //if (userId != 0) + //{ + // roleIds = await _userBasicDao.GetUserRoleIds(userId); + //} + + //// 数据存在 对比权限 + //if (options.RoleIds.Count == 0) + //{ + // // 不需要权限 直接返回 + // return APIResponseModel.CreateSuccessResponseModel(_mapper.Map(options)); + //} + //else + //{ + // // 需要判断权限 判断 roleIds 是不是有权限在 options.RoleIds 里面 + // bool hasPermission = false; + // foreach (var roleId in roleIds) + // { + // if (options.RoleIds.Contains(roleId)) + // { + // hasPermission = true; + // break; + // } + // } + // if (!hasPermission) + // { + // return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction); + // } + // else + // { + // return APIResponseModel.CreateSuccessResponseModel(_mapper.Map(options)); + // } + //} } catch (Exception ex) { diff --git a/LMS.service/appsettings.json b/LMS.service/appsettings.json index 604b119..524319f 100644 --- a/LMS.service/appsettings.json +++ b/LMS.service/appsettings.json @@ -68,6 +68,6 @@ } ] }, - "Version": "1.1.0", + "Version": "1.1.1", "AllowedHosts": "*" }