|
@@ -270,21 +270,21 @@ public class WeComMessageDataJob {
|
|
}
|
|
}
|
|
|
|
|
|
private int fillHistoricalTopMessages(SendMessage sendMessage, Long userId, Long staffId) {
|
|
private int fillHistoricalTopMessages(SendMessage sendMessage, Long userId, Long staffId) {
|
|
- List<PushMessage> list = historicalTopMap.get(staffId);
|
|
|
|
- if (!CollectionUtils.isEmpty(list)) {
|
|
|
|
- int n = 0;
|
|
|
|
- for (PushMessage pushMessage : list) {
|
|
|
|
- if (pushMessage.getUserIds().contains(userId)) {
|
|
|
|
- setVideoId(sendMessage, n, pushMessage.getVideoId());
|
|
|
|
- n++;
|
|
|
|
- if (n >= MAX_VIDEO_NUM) {
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
|
|
+ List<PushMessage> pushMessages = historicalTopMap.get(staffId);
|
|
|
|
+ if (CollectionUtils.isEmpty(pushMessages)) {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ int n = 0;
|
|
|
|
+ for (PushMessage pushMessage : pushMessages) {
|
|
|
|
+ if (pushMessage.getUserIds().contains(userId)) {
|
|
|
|
+ setVideoId(sendMessage, n, pushMessage.getVideoId());
|
|
|
|
+ n++;
|
|
|
|
+ if (n >= MAX_VIDEO_NUM) {
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return n;
|
|
|
|
}
|
|
}
|
|
- return 0;
|
|
|
|
|
|
+ return n;
|
|
}
|
|
}
|
|
|
|
|
|
private int fillGuaranteedMessages(SendMessage sendMessage, Long staffId, int currentCount) {
|
|
private int fillGuaranteedMessages(SendMessage sendMessage, Long staffId, int currentCount) {
|