From 61460bdf892006743e957035b760950b80cf1ccc Mon Sep 17 00:00:00 2001
From: xiaohuang <1559741705@qq.com>
Date: Mon, 25 Mar 2024 21:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7=E7=BB=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AttributeGroupController.java      |  4 ++--
 .../product/service/AttributeInfoService.java     |  2 +-
 .../service/impl/AttributeGroupServiceImpl.java   | 15 ++++++++-------
 .../service/impl/AttributeInfoServiceImpl.java    |  1 +
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java
index bd489a0..6db0a84 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java
@@ -45,10 +45,10 @@ public class AttributeGroupController extends BaseController {
      * 查询属性组列表
      */
     @ApiOperation("获取属性组列表")
-    @RequiresPermissions("product:attributeGroup:list")
+    @RequiresPermissions("product:attributeGroup:list") //权限认证,必须具有指定权限才能进入该方法
     @GetMapping("/list")
     public Result<TableDataInfo<AttributeGroupPageResp>> list(AttributeGroupQueryReq attributeGroupQueryReq) {
-        startPage();
+        startPage();  //设置请求分页数据
         TableDataInfo<AttributeGroupPageResp> tableDataInfo =
                 attributeGroupService.page(AttributeGroup.queryBuild(attributeGroupQueryReq));
         return Result.success(tableDataInfo);
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java
index 14d9431..b707177 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeInfoService.java
@@ -17,7 +17,7 @@ public interface AttributeInfoService extends IService<AttributeInfo> {
      * @param attributeInfo 商品属性
      * @return 商品属性集合
      */
-    public List<AttributeInfo> list(AttributeInfo attributeInfo);
+    public List<AttributeInfo> list(AttributeInfo attributeInfo); // 商品属性对象 attribute_info | 商品属性对象 attribute_info
 
     /**
      * 通过groupId查询属性集合
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
index 6f69e4d..8d9685a 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java
@@ -48,6 +48,7 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
      */
     @Override
     public TableDataInfo<AttributeGroupPageResp> page (AttributeGroup attributeGroupQuery) {
+       // List<AttributeGroup> list = this.list(attributeGroupQuery);
         List<AttributeGroup> list = this.list(attributeGroupQuery);
         List<AttributeGroupPageResp> pageRespList = list.stream()
                 .map(attributeGroup ->
@@ -70,18 +71,18 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
      * @return 属性组
      */
     @Override
-    public List<AttributeGroup> list (AttributeGroup attributeGroup) {
-        LambdaQueryWrapper<AttributeGroup> queryWrapper = new LambdaQueryWrapper<>();
+    public List<AttributeGroup> list (AttributeGroup attributeGroup) { //属性组对象 attribute_group | 属性组对象 attribute_group
+        LambdaQueryWrapper<AttributeGroup> queryWrapper = new LambdaQueryWrapper<>(); //属性组对象 attribute_group
 
-        if (ObjUtils.notNull(attributeGroup.getName())) {
-            queryWrapper.like(AttributeGroup::getName, attributeGroup.getName());
+        if (ObjUtils.notNull(attributeGroup.getName())) { //兼容 charSequence: 如果长度为0, 则认为为空 | 组名称
+            queryWrapper.like(AttributeGroup::getName, attributeGroup.getName()); //组名称 | 组名称
         }
 
-        if (ObjUtils.notNull(attributeGroup.getStates())) {
-            queryWrapper.eq(AttributeGroup::getStates, attributeGroup.getStates());
+        if (ObjUtils.notNull(attributeGroup.getStates())) { //兼容CharSequence: 如果长度为0 则认为为空 | 状态
+            queryWrapper.eq(AttributeGroup::getStates, attributeGroup.getStates()); // 状态 | 状态
         }
 
-        return list(queryWrapper);
+        return list(queryWrapper); //查询列表
     }
 
     /**
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java
index 0da9ac8..2700831 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeInfoServiceImpl.java
@@ -73,5 +73,6 @@ public class AttributeInfoServiceImpl extends ServiceImpl<AttributeInfoMapper, A
         return this.listByIds(
                 list
         );
+
     }
 }