空指针

src/jy/pretreated/analytable.go

@@ -515,8 +515,10 @@ func (table *Table) MergerToTableresult() {
 			package1 := table.TableResult.PackageMap.Map[k]
 			if package1 == nil {
 				table.TableResult.PackageMap.AddKey(k, v)
-				if vvv,ok:= v.(*u.BlockPackage);ok{
-					MergeKvTags(table.TableResult.KvTags,vvv.TableKV.KvTags)
+				if vvv, ok := v.(*u.BlockPackage); ok {
+					if vvv.TableKV != nil && len(vvv.TableKV.KvTags) > 0 {
+						MergeKvTags(table.TableResult.KvTags, vvv.TableKV.KvTags)
+					}
 				}
 			} else {
 				bp := package1.(*u.BlockPackage)
@@ -3146,7 +3148,7 @@ func initLineMapLineMapArr(table *Table) (lineMapArr map[string]*SortMap, lineMa
 	for _, key := range table.SortKV.Keys { //遍历table.SortKV.Keys而不是直接遍历table.SortKV.Map是为了得到table头的顺序
 		val := table.SortKV.Map[key]
 		key = regReplAllSpace.ReplaceAllString(key, "")
-		key = strings.Replace(key, "", "", -1)    //处理一个特殊的采购量 经上层处理空格后未处理掉
+		key = strings.Replace(key, "", "", -1) //处理一个特殊的采购量 经上层处理空格后未处理掉
 		if realTypeVal, ok := val.([]string); ok { //val为数组 {"数量":["1","2","3"]}
 			/*
 				{