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

controllers/target.go

@@ -3963,11 +3963,18 @@ func (this *TargetController) ExcelDataAdd() {
 			for j := 1; j < len(req.Data[i]); j++ {
 				closeVal := req.Data[i][j].(map[string]interface{})
 				if item, ok := secNameToDateMap[secNameList[j-1]]; ok {
-					item[date] = closeVal["m"].(string)
+					tmpVal, ok := closeVal["m"].(string)
+					if !ok || tmpVal == "" {
+						continue
+					}
+					item[date] = tmpVal
 				} else {
-					// secNameToDateMap[secNameList[j]] = make(map[string]string)
+					tmpVal, ok := closeVal["m"].(string)
+					if !ok || tmpVal == "" {
+						continue
+					}
 					secNameToDateMap[secNameList[j-1]] = map[string]string{
-						date: closeVal["m"].(string),
+						date: tmpVal,
 					}
 				}
 			}
@@ -4091,6 +4098,9 @@ func (this *TargetController) ExcelDataAdd() {
 			edbCodeInfoMap[item.SecName] = item
 			oldEdbCodeInfoMap[item.SecName] = item
 		}
+	} else {
+		// 如果没有更换指标类别和频度，那就保持一致
+		oldEdbCodeInfoMap = edbCodeInfoMap
 	}
 
 	// 删除历史类别下的指标及数据