From 4a18a6f39ee02e2038f81e7468f9d5c3be8d9096 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 3 Aug 2023 15:31:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=20=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/portrait/manage/TagManage.java           | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
index dbb16e5..75a7998 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Classname TagManage
@@ -130,32 +131,29 @@ public class TagManage {
         if(CollUtil.isEmpty(dtos)){
             return "参入的标签为空";
         }
-
         UserInfoDetails user = LoginUserUtil.loginUserDetail();
-
-        Integer successNum = 0;
+        String projectCode = dtos.get(0).getProjectCode();
+        Project project = projectService.getProjectByCode(projectCode);
+        VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
+        projectTagService.remove(Wrappers.lambdaQuery(ProjectTag.class)
+                .eq(ProjectTag::getProjectCode,projectCode));
+        //去重
+        dtos = dtos.stream().distinct().collect(Collectors.toList());
         for(TagToProjectDTO dto : dtos){
-            String projectCode = dto.getProjectCode();
-            Project project = projectService.getProjectByCode(projectCode);
-            VUtils.isTrue(Objects.isNull(project)).throwMessage("项目不存在!");
             Long tagId = dto.getTagId();
             Tag tag = tagService.getById(tagId);
             VUtils.isTrue(Objects.isNull(tag)).throwMessage("标签不存在!");
-
             VUtils.isTrue(!tag.getAreaCode().equals(project.getAreaCode()))
                     .throwMessage("项目和标签不是一个区域的!");
-
             ProjectTag projectTag = new ProjectTag();
             projectTag.setProjectCode(projectCode);
             projectTag.setTagId(tagId);
             projectTag.setCreateOn(LocalDateTime.now());
             projectTag.setCreateBy(user.getUsername());
-            if(projectTagService.save(projectTag)){
-                successNum ++;
-            }
+            projectTagService.save(projectTag);
         }
 
-        return "保存成功" + successNum + "条";
+        return "保存成功";
     }
 
     public String removeTagToProject(TagToProjectDTO dto) {