Subversion Repositories SmartDukaan

Rev

Rev 26056 | Rev 26060 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26056 Rev 26057
Line 561... Line 561...
561 
		if (!userCampaigns.isEmpty()) {
 561 
		if (!userCampaigns.isEmpty()) {
562 
			List<Integer> campaignIds = new ArrayList<>();
 562 
			List<Integer> campaignIds = new ArrayList<>();
563 
			for (UserCampaign userCampaign : userCampaigns) {
 563 
			for (UserCampaign userCampaign : userCampaigns) {
564 
				campaignIds.add(userCampaign.getCampaignId());
 564 
				campaignIds.add(userCampaign.getCampaignId());
565 
			}
 565 
			}
- 
 
 566 
			if (messageType == null) {
- 
 
 567 
				messageType = MessageType.notification;
- 
 
 568 
			}
566 
			List<NotificationCampaign> notificationCampaigns = notificationCampaignRepository.selectbyCids(campaignIds,
 569 
			List<NotificationCampaign> notificationCampaigns = notificationCampaignRepository
567 
					offset, limit);
 570 
					.selectbyCidsAndType(campaignIds, messageType, offset, limit);
568 
			LOGGER.info("messageType" + messageType);
 571 
			LOGGER.info("messageType" + messageType);
569 
			notifications = getNotifications(notificationCampaigns, messageType);
 572 
			notifications = getNotifications(notificationCampaigns, messageType);
570 
 
 573 
 
571 
		}
 574 
		}
572 
 
 575