From 067ff6cc4dd8ce680cc38ba9da811ed93c289c48 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 27 Feb 2024 21:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20bugfix=20master=20=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=20pr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/dal/mysql/comment/ProductCommentMapper.java  | 9 ++++-----
 .../controller/admin/permission/MenuController.java      | 2 +-
 .../controller/admin/permission/vo/role/RoleRespVO.java  | 1 +
 .../yudao/module/system/dal/redis/RedisKeyConstants.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
index ca04c507c..47421d315 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
@@ -25,19 +25,18 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
     }
 
     static void appendTabQuery(LambdaQueryWrapperX<ProductCommentDO> queryWrapper, Integer type) {
-        LambdaQueryWrapperX<ProductCommentDO> queryWrapperX = new LambdaQueryWrapperX<>();
         // 构建好评查询语句：好评计算 总评 >= 4
         if (ObjectUtil.equal(type, AppCommentPageReqVO.GOOD_COMMENT)) {
-            queryWrapperX.ge(ProductCommentDO::getScores, 4);
+            queryWrapper.ge(ProductCommentDO::getScores, 4);
         }
         // 构建中评查询语句：中评计算 总评 >= 3 且 总评 < 4
         if (ObjectUtil.equal(type, AppCommentPageReqVO.MEDIOCRE_COMMENT)) {
-            queryWrapperX.ge(ProductCommentDO::getScores, 3);
-            queryWrapperX.lt(ProductCommentDO::getScores, 4);
+            queryWrapper.ge(ProductCommentDO::getScores, 3);
+            queryWrapper.lt(ProductCommentDO::getScores, 4);
         }
         // 构建差评查询语句：差评计算 总评 < 3
         if (ObjectUtil.equal(type, AppCommentPageReqVO.NEGATIVE_COMMENT)) {
-            queryWrapperX.lt(ProductCommentDO::getScores, 3);
+            queryWrapper.lt(ProductCommentDO::getScores, 3);
         }
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
index d3668661c..104141751 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
@@ -50,7 +50,7 @@ public class MenuController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除菜单")
-    @Parameter(name = "id", description = "角色编号", required= true, example = "1024")
+    @Parameter(name = "id", description = "菜单编号", required= true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:menu:delete')")
     public CommonResult<Boolean> deleteMenu(@RequestParam("id") Long id) {
         menuService.deleteMenu(id);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
index 05be5f3ed..f249406fa 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
@@ -25,6 +25,7 @@ public class RoleRespVO {
     @ExcelProperty("角色名称")
     private String name;
 
+    @Schema(description = "角色标志", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
     @NotBlank(message = "角色标志不能为空")
     @ExcelProperty("角色标志")
     private String code;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java
index cda6dab4b..4964a2be2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java
@@ -52,7 +52,7 @@ public interface RedisKeyConstants {
     /**
      * OAuth2 客户端的缓存
      * <p>
-     * KEY 格式：user:{id}
+     * KEY 格式：oauth_client:{id}
      * VALUE 数据类型：String 客户端信息
      */
     String OAUTH_CLIENT = "oauth_client";
@@ -78,7 +78,7 @@ public interface RedisKeyConstants {
     /**
      * 邮件账号的缓存
      * <p>
-     * KEY 格式：sms_template:{id}
+     * KEY 格式：mail_account:{id}
      * VALUE 数据格式：String 账号信息
      */
     String MAIL_ACCOUNT = "mail_account";