From d5fd551e8f1aaceb7fd5982cd8a635f395193ea4 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 11 May 2021 13:28:11 +0800
Subject: [PATCH] =?UTF-8?q?e=E9=94=A6=E6=B0=B4-=E5=BF=97=E6=84=BF=E8=80=85?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C-=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=B0=8F=E7=BB=84=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VolunteerTagRelationServiceImpl.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagRelationServiceImpl.java
index efaf2b95..c960ebce 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagRelationServiceImpl.java
@@ -102,10 +102,14 @@ public class VolunteerTagRelationServiceImpl extends BaseServiceImpl<VolunteerTa
         // 删除已绑定志愿者标签
         baseDao.updateDelFlagByVolunteerId(tagDto.getVolunteerId());
         // 插入新志愿者标签
-        VolunteerTagRelationEntity entity = new VolunteerTagRelationEntity();
-        entity.setVolunteerId(tagDto.getVolunteerId());
-        entity.setTagId(tagDto.getTagId());
-        return insert(entity);
+        if (StringUtils.isNotEmpty(tagDto.getTagId())) {
+            VolunteerTagRelationEntity entity = new VolunteerTagRelationEntity();
+            entity.setVolunteerId(tagDto.getVolunteerId());
+            entity.setTagId(tagDto.getTagId());
+            return insert(entity);
+        }
+
+        return true;
     }
 
 }