xuemingyang 3 жил өмнө
parent
commit
cfdc74a8b0

+ 12 - 0
src/jfw/modules/bigmember/src/entity/marketAnalysis/customized_analysis.go

@@ -447,6 +447,9 @@ func AmountCompute(thisRow AreaCTop, types string, eid map[string]string) (rData
 				id := util2.EncodeId(va.Winner)
 				id := util2.EncodeId(va.Winner)
 				rW["id"] = id
 				rW["id"] = id
 				rW["winner"] = eid[va.Winner]
 				rW["winner"] = eid[va.Winner]
+				if eid[va.Winner] == "" {
+					continue
+				}
 				rW["winner_amount"] = va.WinnerAmount.Amount
 				rW["winner_amount"] = va.WinnerAmount.Amount
 				//rW["amount_scale"] = va.WinnerAmount.Amount / v.AreaAmount.Amount
 				//rW["amount_scale"] = va.WinnerAmount.Amount / v.AreaAmount.Amount
 				rWinner = append(rWinner, rW)
 				rWinner = append(rWinner, rW)
@@ -475,6 +478,9 @@ func AmountCompute(thisRow AreaCTop, types string, eid map[string]string) (rData
 				id := util2.EncodeId(va.Winner)
 				id := util2.EncodeId(va.Winner)
 				rW["id"] = id
 				rW["id"] = id
 				rW["winner"] = eid[va.Winner]
 				rW["winner"] = eid[va.Winner]
+				if eid[va.Winner] == "" {
+					continue
+				}
 				rW["winner_amount"] = va.WinnerAmount.Amount
 				rW["winner_amount"] = va.WinnerAmount.Amount
 				//rW["amount_scale"] = va.WinnerAmount.Amount / v.AreaAmount.Amount
 				//rW["amount_scale"] = va.WinnerAmount.Amount / v.AreaAmount.Amount
 				rWinner = append(rWinner, rW)
 				rWinner = append(rWinner, rW)
@@ -509,6 +515,9 @@ func CountCompute(thisRow AreaCTop, types string, eid map[string]string) (rData
 				id := util2.EncodeId(va.Winner)
 				id := util2.EncodeId(va.Winner)
 				rW["id"] = id
 				rW["id"] = id
 				rW["winner"] = eid[va.Winner]
 				rW["winner"] = eid[va.Winner]
+				if eid[va.Winner] == "" {
+					continue
+				}
 				rW["winner_total"] = va.WinnerTotal
 				rW["winner_total"] = va.WinnerTotal
 				rWinner = append(rWinner, rW)
 				rWinner = append(rWinner, rW)
 			}
 			}
@@ -539,6 +548,9 @@ func CountCompute(thisRow AreaCTop, types string, eid map[string]string) (rData
 				id := util2.EncodeId(va.Winner)
 				id := util2.EncodeId(va.Winner)
 				rW["id"] = id
 				rW["id"] = id
 				rW["winner"] = eid[va.Winner]
 				rW["winner"] = eid[va.Winner]
+				if eid[va.Winner] == "" {
+					continue
+				}
 				rW["winner_total"] = va.WinnerTotal
 				rW["winner_total"] = va.WinnerTotal
 				rWinner = append(rWinner, rW)
 				rWinner = append(rWinner, rW)
 			}
 			}