From 7c5782f90c73553aba63203a7fba79f3d0779227 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 11 Dec 2020 14:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BD=91=E6=A0=BCId=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IssueTagsServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index 744852e874..5b7b639389 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IssueDao;
 import com.epmet.dao.IssueProjectTagDictDao;
 import com.epmet.dao.IssueTagsDao;
 import com.epmet.dto.IssueTagsDTO;
@@ -34,6 +35,7 @@ import com.epmet.dto.form.IssueTagsFormDTO;
 import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
+import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
 import com.epmet.entity.IssueTagsEntity;
 import com.epmet.redis.IssueProjectTagDictRedis;
@@ -67,6 +69,8 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
     private IssueProjectTagDictDao issueProjectTagDictDao;
     @Autowired
     private IssueProjectTagDictRedis dictRedis;
+    @Autowired
+    private IssueDao issueDao;
 
     @Override
     public PageData<IssueTagsDTO> page(Map<String, Object> params) {
@@ -194,7 +198,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         // 不为空时走这
         List<IssueTagFormDTO> selectTags = form.getTagList();
         List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
-        IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());
+        IssueEntity issueEntity = issueDao.selectById(form.getIssueId());
         if (!CollectionUtils.isEmpty(newTags)){
             // 需要删除的标签
             List<IssueTagFormDTO> delList = tags.stream().filter(tag -> !newTags.contains(tag)).collect(toList());
@@ -227,7 +231,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             List<IssueTagsFormDTO> needInsert = ConvertUtils.sourceToTarget(newTags, IssueTagsFormDTO.class);
             needInsert.forEach(n -> {
                 n.setCustomerId(customerId);
-                n.setGridId(issueTagsDTO.getGridId());
+                n.setGridId(issueEntity.getGridId());
                 n.setIssueId(form.getIssueId());
             });
             baseDao.insertNewTags(needInsert);