From d02b408ef1ed9ab85679a4dbeed8960b582a9fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AC=A8=E8=9B=8B?=
 <14958938+qianqiao5-6-7@user.noreply.gitee.com>
Date: Sun, 17 Nov 2024 21:52:33 +0800
Subject: [PATCH] =?UTF-8?q?2204-11-17=20=20(=E4=BF=AE=E6=94=B91.0=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/req/AttributeGroupEditReq.java     |  1 +
 .../domain/req/ProjectInfoEditReq.java        |  1 +
 .../impl/AttributeGroupServiceImpl.java       | 26 +++++++++++--------
 3 files changed, 17 insertions(+), 11 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 2bac1db..81195bd 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
@@ -39,5 +39,6 @@ public class AttributeGroupEditReq extends BaseEntity {
     /** 属性id 集合 */
     @ApiModelProperty(name = "属性集合", value = "属性集合", required = true)
     private List<AttributeInfo> attributeList;
+    private List<Long> attributeIdList;
 
 }
diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java
index 4711de1..3615141 100644
--- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java
+++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoEditReq.java
@@ -63,4 +63,5 @@ public class ProjectInfoEditReq extends BaseEntity {
     @ApiModelProperty(name = "品牌", value = "品牌")
     private Long brandId;
 
+
 }
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 fb40f73..bf2287d 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
@@ -134,12 +134,21 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     public void updateAttribute(Long id, AttributeGroupEditReq attributeGroupEditReq) {
       //删除原 属性组
         attributeGroupMapper.delete(id);
-        //获取新数据组
-        List<AttributeInfo> list = attributeGroupEditReq.getAttributeList();
-        //添加
-        for (AttributeInfo info : list) {
-            attributeGroupMapper.add(id,info.getId());
+        if (null == attributeGroupEditReq.getAttributeList() || 0==attributeGroupEditReq.getAttributeList().size()){
+            List<Long> list = attributeGroupEditReq.getAttributeIdList();
+            //添加
+            for (Long info : list) {
+                attributeGroupMapper.add(id,info);
+            }
+        }else {
+            List<AttributeInfo> list = attributeGroupEditReq.getAttributeList();
+            //添加
+            for (AttributeInfo info : list) {
+                attributeGroupMapper.add(id,info.getId());
+            }
         }
+        //获取新数据组
+
     }
 
     /**
@@ -184,16 +193,11 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
                             attributeInfos
                     ).build();//修改回显时信息
         }
-            List<Long> list =new ArrayList<>();
-            List<AttributeInfo> attributeInfos = attributeInfoService.listByIds(list);
-
 
         return AttributeGroupUpd.builder()
                 .id(byId.getId())
                 .name(byId.getName())
-                .attributeList(//属性
-                        attributeInfos
-                ).build();//修改回显时信息
+                .build();//修改回显时信息
     }