✨ bugfix master 的一些 pr

YunaiV · Feb 27, 2024 · 067ff6c · 067ff6c
1 parent d134bfc
commit 067ff6c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java b/...src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
@@ -25,19 +25,18 @@ default PageResult<ProductCommentDO> selectPage(ProductCommentPageReqVO reqVO) {
     }
 
     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/.../main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/.../main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
@@ -50,7 +50,7 @@ public CommonResult<Boolean> updateMenu(@Valid @RequestBody MenuSaveVO updateReq
 
     @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/...n/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/...n/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/...-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java b/...-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";