Merge remote-tracking branch 'origin/V20221214' into zouap

models/user_business_analysis.go

@@ -785,8 +785,9 @@ func isUserYearData(tableName string) bool {
 		if currentTimeNow.Year() >= 2023 {
 			return false
 		}
+		return true
 	}
-	return true
+	return false
 }
 
 func getBonusMap() map[string]map[string]int {
@@ -811,6 +812,7 @@ func getBonusMap() map[string]map[string]int {
 					record, ok := bonusMap[userName]
 					if !ok {
 						record = make(map[string]int)
+						bonusMap[userName] = record
 					}
 					record["times"] = getMapKeyStringValue("times", record) + getIntValue(aLine[3])
 					record["total_bonus"] = getMapKeyStringValue("total_bonus", record) + getIntValue(aLine[4])