Merge branch 'dev/v1.2.16.2_rjj' of moapp/MessageCenter into hotfix/v1.2.16.2

rpc/internal/common/msglistService.go

@@ -359,6 +359,7 @@ func BitmapCountClassUnread(userId string, groupId int64, classUnreadCountMap ma
 		count int64
 	)
 	data := make(map[string]int64)
+	classCount = map[string]int64{}
 	if _, ok := entity.ClassSearchMap[groupId]; !ok {
 		return
 	}
@@ -391,6 +392,9 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
 	redisKey := fmt.Sprintf(UserClassMapKey, userId)
 	redisData, err := redis.GetBytes(redisModule, redisKey)
 	findRes := []UserClassSummary{}
+	classUnreadCountMap = map[int]int{}
+	classUnreadMsgMap = map[int][]int{}
+	classAllMsgMap = map[int][]int{}
 	if redisData != nil && err == nil {
 		json.Unmarshal(*redisData, &findRes)
 		for _, v := range findRes {
@@ -417,6 +421,7 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
 			return
 		}
 		findRes = append(findRes, group)
+		log.Println("========", len(group.ClassUnread))
 		classUnreadCountMap[int(group.GroupId)] = len(group.ClassUnread)
 		classUnreadMsgMap[int(group.GroupId)] = Uint32ArrToIntArr(group.ClassUnread)
 		//classAllCountMap[int(group.GroupId)] = len(group.ClassAll)