From c07369c2975de67a2e5cdea39b9bdf256f5c8c0b Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Fri, 23 May 2025 21:05:17 +0800
Subject: [PATCH] =?UTF-8?q?V=201.1.1=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LMS.service/Service/OptionsService.cs | 67 +++++++++++++++------------
 LMS.service/appsettings.json          |  2 +-
 2 files changed, 39 insertions(+), 30 deletions(-)

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 获取指定的配置项
         /// <summary>
-        /// 获取指定的配置项，需要判断权限
+        /// 获取指定的配置项，只能获取不需要权限的
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="category"></param>
@@ -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<long> roleIds = [];
-                if (userId != 0)
+                if (options.RoleIds != null && options.RoleIds.Count != 0)
                 {
-                    roleIds = await _userBasicDao.GetUserRoleIds(userId);
-                }
-
-                // 数据存在 对比权限 
-                if (options.RoleIds.Count == 0)
-                {
-                    // 不需要权限 直接返回
-                    return APIResponseModel<OptionsDto>.CreateSuccessResponseModel(_mapper.Map<OptionsDto>(options));
+                    return APIResponseModel<OptionsDto>.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<OptionsDto>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
-                    }
-                    else
-                    {
-                        return APIResponseModel<OptionsDto>.CreateSuccessResponseModel(_mapper.Map<OptionsDto>(options));
-                    }
+                    return APIResponseModel<OptionsDto>.CreateSuccessResponseModel(_mapper.Map<OptionsDto>(options));
                 }
+
+                //List<long> roleIds = [];
+                //if (userId != 0)
+                //{
+                //    roleIds = await _userBasicDao.GetUserRoleIds(userId);
+                //}
+
+                //// 数据存在 对比权限 
+                //if (options.RoleIds.Count == 0)
+                //{
+                //    // 不需要权限 直接返回
+                //    return APIResponseModel<OptionsDto>.CreateSuccessResponseModel(_mapper.Map<OptionsDto>(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<OptionsDto>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                //    }
+                //    else
+                //    {
+                //        return APIResponseModel<OptionsDto>.CreateSuccessResponseModel(_mapper.Map<OptionsDto>(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": "*"
 }