From 39e4dfbcdf654c7ea1c48e542d8e5b1032ebb91a Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 18 Jan 2024 14:07:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=88=B0=E9=9B=86=E5=9B=A2=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MemberGroupRelationServiceImpl.java        | 13 +++++++++----
 .../pile/service/impl/MemberGroupServiceImpl.java   |  4 +---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java
index d5860b7ef..dccfdec76 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java
@@ -1,11 +1,13 @@
 package com.jsowell.pile.service.impl;
 
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import com.jsowell.pile.mapper.MemberGroupRelationMapper;
-import java.util.List;
 import com.jsowell.pile.domain.MemberGroupRelation;
+import com.jsowell.pile.mapper.MemberGroupRelationMapper;
 import com.jsowell.pile.service.MemberGroupRelationService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 @Service
 public class MemberGroupRelationServiceImpl implements MemberGroupRelationService{
 
@@ -64,6 +66,9 @@ public class MemberGroupRelationServiceImpl implements MemberGroupRelationServic
 
     @Override
     public int batchInsert(List<MemberGroupRelation> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return 0;
+        }
         return memberGroupRelationMapper.batchInsert(list);
     }
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
index dff502703..06ced2315 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
@@ -175,14 +175,12 @@ public class MemberGroupServiceImpl implements MemberGroupService {
             return 0;
         }
         // 校验通过，关系存入数据库
-        List<MemberGroupRelation> list = Lists.newArrayList();
         MemberGroupRelation relation = new MemberGroupRelation();
         relation.setMemberId(memberBasicInfo.getMemberId());
         relation.setGroupCode(groupCode);
         relation.setCreateTime(DateUtils.getNowDate());
         relation.setDelFlag(DelFlagEnum.NORMAL.getValue());
-        memberGroupRelationService.batchInsert(list);
-        return memberGroupRelationService.batchInsert(list);
+        return memberGroupRelationService.batchInsert(Lists.newArrayList(relation));
     }
 
     @Override