合并分支 'test' 到 'master'

Test



查看合并请求 !8

@@ -56,21 +56,22 @@ func LoadPerformanceDimensions(rows [][]string) ([]*PerformanceDimension, error)
 		if len(item) > 4 && item[4] != "" {
 			taskName = item[4]
 		} else {
-			taskName = ""
+			taskName = "填写自评反馈"
 		}
 		form.Task = taskName
 		//权重
 		if len(item) > 6 && item[6] != "" {
 			weightName = item[6]
-		} else {
-			weightName = "/"
 		}
 		form.Weight = weightName
 		//标准
 		if len(item) > 7 && item[7] != "" {
 			standardName = item[7]
-		} else {
-			standardName = ""
+		}
+		if key < len(rows)-1 {
+			if len(rows[key+1]) > 1 && rows[key+1][1] != "" {
+				standardName = ""
+			}
 		}
 		form.Standard = standardName
 		formRows = append(formRows, form)