add related issue when create issue by import (#2478)

apistructs/issue.go

@@ -88,12 +88,17 @@ func (s *Issue) SetRelatedIssueIDs(ids string) error {
 		return nil
 	}
 	idStrs := strings.Split(ids, ",")
+	dp := map[uint64]bool{}
 	relatedIssueIDs := make([]uint64, 0)
 	for _, id := range idStrs {
 		issueID, err := strconv.Atoi(id)
 		if err != nil {
 			return err
 		}
+		if dp[uint64(issueID)] {
+			continue
+		}
+		dp[uint64(issueID)] = true
 		relatedIssueIDs = append(relatedIssueIDs, uint64(issueID))
 	}
 	s.relatedIssueIDs = relatedIssueIDs

modules/dop/services/issue/convert.go

@@ -361,6 +361,19 @@ func (svc *Issue) decodeFromExcelFile(req apistructs.IssueImportExcelRequest, r
 		allInstance            []apistructs.IssuePropertyRelationCreateRequest
 	)
 	sheets, err := excel.Decode(r)
+	// filter empty row
+	sheetLst := make([][][]string, 0)
+	for _, rows := range sheets {
+		rowLst := make([][]string, 0)
+		for _, row := range rows {
+			if strings.Join(row, "") == "" {
+				continue
+			}
+			rowLst = append(rowLst, row)
+		}
+		sheetLst = append(sheetLst, rowLst)
+	}
+	sheets = sheetLst
 	if err != nil {
 		return nil, nil, nil, nil, nil, 0, fmt.Errorf("failed to decode excel, err: %v", err)
 	}

modules/dop/services/issue/import.go

@@ -172,6 +172,18 @@ func (svc *Issue) storeExcel2DB(request apistructs.IssueImportExcelRequest, issu
 				falseReason = append(falseReason, "创建任务失败, err:"+err.Error())
 				continue
 			}
+			for _, issueRelated := range req.GetRelatedIssueIDs() {
+				relatedIssue, err := svc.db.GetIssue(int64(issueRelated))
+				if err != nil {
+					continue
+				}
+				if relatedIssue.ProjectID == request.ProjectID {
+					_ = svc.db.CreateIssueRelations(&dao.IssueRelation{
+						IssueID:      issueRelated,
+						RelatedIssue: create.ID,
+					})
+				}
+			}
 			// 添加标签关联关系
 			labels, err := svc.bdl.ListLabelByNameAndProjectID(req.ProjectID, req.Labels)
 			if err != nil {