Merge remote-tracking branch 'origin/eta/1.0.2' into debug

services/data/excel/custom_analysis.go

@@ -301,8 +301,14 @@ func SaveCustomAnalysisTable(excelInfo *excel.ExcelInfo, excelName, content, exc
 
 	// 表格
 	excelInfo.ExcelName = excelName
-	excelInfo.ExcelClassifyId = excelClassifyId
-	excelInfo.ExcelImage = excelImage
+	// 如果分类不传入的话，那么分类不变更
+	if excelClassifyId <= 0 {
+		excelInfo.ExcelClassifyId = excelClassifyId
+	}
+	// 如果缩略图不传入的话，那么缩略图不变更
+	if excelImage != `` {
+		excelInfo.ExcelImage = excelImage
+	}
 	excelInfo.ModifyTime = time.Now()
 	updateExcelInfoParam := []string{"ExcelName", "ExcelClassifyId", "ExcelImage", "ModifyTime"}
 

services/data/excel/custom_analysis_edb.go

@@ -114,6 +114,8 @@ func HandleEdbSequenceVal(dateSequenceVal, dataSequenceVal []string) (newDateLis
 				continue
 			}
 
+			v = strings.Replace(v, ",", "", -1)
+			v = strings.Replace(v, "，", "", -1)
 			tmpValDec, tmpErr := decimal.NewFromString(v)
 			if tmpErr != nil {
 				if startData {