From 70223a4d0466bba0b93c08af42c3046685696a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E7=A6=8F=E6=B3=A2?=
 <14587188+cui-fubo@user.noreply.gitee.com>
Date: Fri, 15 Nov 2024 16:10:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/product/domain/req/AttributeGroupEditReq.java   | 2 +-
 .../muyu/product/controller/AttributeGroupController.java    | 2 +-
 .../java/com/muyu/product/mapper/AttributeGroupMapper.java   | 5 +++--
 .../muyu/product/service/impl/AttributeGroupServiceImpl.java | 3 ++-
 .../main/resources/mapper/product/AttributeGroupMapper.xml   | 5 ++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java
index cfb0e1a..a330c79 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java
@@ -37,5 +37,5 @@ public class AttributeGroupEditReq extends BaseEntity {
     @ApiModelProperty(name = "状态", value = "状态", required = true)
     private String states;
 
-    private List<AttributeInfo> attributeIdList ;
+    private List<AttributeInfo> attributeList ;
 }
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 bc404d4..f2193d9 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
@@ -102,7 +102,7 @@ public class AttributeGroupController extends BaseController {
     @ApiOperation("修改属性组")
     public Result edit(@PathVariable Long id, @RequestBody AttributeGroupEditReq attributeGroupEditReq) {
          attributeGroupService.updateByIdList(id,attributeGroupEditReq);
-        return Result.success();
+        return Result.success("修改成功");
     }
 
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java
index 27a22f7..972ba44 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java
@@ -3,7 +3,7 @@ package com.muyu.product.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.product.domain.AttributeGroup;
-import com.muyu.product.domain.req.AttributeGroupEditReq;
+import com.muyu.product.domain.AttributeInfo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,5 +17,6 @@ public interface AttributeGroupMapper extends BaseMapper<AttributeGroup> {
     void deleteId(Long id);
 
 
-    void install(@Param("id") Long id, @Param("attributeList") List<Long> attributeList);
+    void install(@Param("id") Long id, @Param("longs") List<Long> longs);
+
 }
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 c2bbae4..b55b2ce 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
@@ -128,7 +128,8 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     public void updateByIdList(Long id, AttributeGroupEditReq attributeGroupEditReq) {
         attributeGroupMapper.deleteId(id);
 
-        List<Long> longs = attributeGroupEditReq.getAttributeIdList().stream().map(AttributeInfo::getId).toList();
+        List<AttributeInfo> list = attributeGroupEditReq.getAttributeList();
+        List<Long> longs = list.stream().map(AttributeInfo::getId).toList();
         attributeGroupMapper.install(id,longs);
     }
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml
index f19b975..53c7be6 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml
@@ -21,10 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="install">
         INSERT INTO as_attribute_group
         ( `group_id`, `attribute_id`) VALUES
-        <foreach collection="attributeList" separator="," item="attributeList">
-            (#{id}, #{attributeList})
+        <foreach collection="longs" separator="," item="longs">
+            (#{id}, #{longs})
         </foreach>
-
     </insert>
     <delete id="deleteId">
         delete from as_attribute_group where group_id = #{id}