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

rpc/internal/common/msglistService.go

@@ -156,7 +156,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 	}
 	data.SortData = columnData
 	if len(userAllMsgArr) == 0 {
-		fmt.Printf("此用户暂无消息 : %s", err.Error())
+		log.Printf("此用户暂无消息 : %s", err.Error())
 		return data, nil
 	}
 
@@ -421,7 +421,7 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
 			return
 		}
 		findRes = append(findRes, group)
-		log.Println("========", len(group.ClassUnread))
+		//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)
@@ -488,7 +488,7 @@ func GetUserMsgSummary(userId string, isfilterActive bool) (userAllMsg, userRead
 	err = row.Scan(&userAllMsg, &userReadMsg, &userUnreadMsg)
 	if err != nil {
 		log.Println("此用户暂无数据：", err)
-		return
+		return userAllMsg, userReadMsg, userUnreadMsg, err
 	}
 	//缓存
 	redis.Put(redisModule, key, map[string][]uint32{
@@ -496,7 +496,7 @@ func GetUserMsgSummary(userId string, isfilterActive bool) (userAllMsg, userRead
 		"userReadMsg":   userReadMsg,
 		"userUnreadMsg": userUnreadMsg,
 	}, config.ConfigJson.RedisFailureTime)
-	return
+	return userAllMsg, userReadMsg, userUnreadMsg, nil
 }
 
 // Uint32ArrToIntArr []uint32转[]int