更新

@@ -10,7 +10,7 @@
             "type": "go",
             "type": "go",
             "request": "launch",
             "request": "launch",
             "mode": "debug",
             "mode": "debug",
-            "buildFlags": "--tags=local",
+            "buildFlags": "",
             "program": "./main.go"
             "program": "./main.go"
         },
         },
     ]
     ]

@@ -280,6 +280,9 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ListAssessContentCy
 	level3 := map[string][]string{} // key=分类+得分项类型  val=名称
 	level3 := map[string][]string{} // key=分类+得分项类型  val=名称
 	level4 := map[string]string{}   //key=分类+名称 val=评估标准
 	level4 := map[string]string{}   //key=分类+名称 val=评估标准
 	for _, v := range contentList {
 	for _, v := range contentList {
+		if v.ContentId == 0 {
+			continue
+		}
 		level1Item := ""
 		level1Item := ""
 		for _, v1 := range level1 {
 		for _, v1 := range level1 {
 			if v.Category == v1 {
 			if v.Category == v1 {
@@ -374,6 +377,7 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ListAssessContentCy
 		}
 		}
 		tableRows[v.TargetUserId]["TargetUserName"] = v.TargetUserName
 		tableRows[v.TargetUserId]["TargetUserName"] = v.TargetUserName
 		tableRows[v.TargetUserId]["BeginDay"] = v.BeginDay
 		tableRows[v.TargetUserId]["BeginDay"] = v.BeginDay
+		if v.ContentId > 0 {
 			value := []string{v.Value}
 			value := []string{v.Value}
 			for _, v2 := range v.Remark {
 			for _, v2 := range v.Remark {
 				value = append(value, v2.RemarkText)
 				value = append(value, v2.RemarkText)
@@ -381,6 +385,7 @@ func (srv StaffAssessServeice) ExportUserAssess(param *query.ListAssessContentCy
 			key := v.Category + "+" + v.ContentName
 			key := v.Category + "+" + v.ContentName
 			tableRows[v.TargetUserId][key] = strings.Join(value, "\n")
 			tableRows[v.TargetUserId][key] = strings.Join(value, "\n")
 		}
 		}
+	}
 	//将数据写入xlsx
 	//将数据写入xlsx
 	xlsxFile := excelize.NewFile()
 	xlsxFile := excelize.NewFile()
 	sheetIndex := xlsxFile.GetActiveSheetIndex()
 	sheetIndex := xlsxFile.GetActiveSheetIndex()

@@ -326,6 +326,8 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 }
 }
 
 
 type ExportData1 struct {
 type ExportData1 struct {
+	AssessId            string
+	ContentId           int
 	TargetUserId        string //被评估人的id
 	TargetUserId        string //被评估人的id
 	TargetUserName      string //被评估人的名称
 	TargetUserName      string //被评估人的名称
 	BeginDay            string //评估的日期
 	BeginDay            string //评估的日期