CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Merge pull request #511 from Anh3h/notification

Browse Source 
Fix bug in generating notification.
This commit is contained in:
Steve Conrad
2019-01-25 09:31:18 -06:00
committed by GitHub
parent 3c21ae1483 f63a8dea81
commit cd5b3804a6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationDomainServiceImpl.java
+4 -2
View File
@@ -51,7 +51,9 @@ import javax.jms.Queue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.Map; import java.util.Map;
@Service @Service
@@ -583,7 +585,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
private List<Long> retrieveSubscribers(Long officeId, String permission) { private List<Long> retrieveSubscribers(Long officeId, String permission) {
Collection<TopicSubscriberData> topicSubscribers = new ArrayList<>(); Set<TopicSubscriberData> topicSubscribers = new HashSet<>();
List<Long> subscriberIds = new ArrayList<>(); List<Long> subscriberIds = new ArrayList<>();
Long entityId = officeId; Long entityId = officeId;
String entityType= ""; String entityType= "";
@@ -596,7 +598,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
for (Role curRole : allRoles) { for (Role curRole : allRoles) {
if (curRole.hasPermissionTo(permission) || curRole.hasPermissionTo("ALL_FUNCTIONS")) { if (curRole.hasPermissionTo(permission) || curRole.hasPermissionTo("ALL_FUNCTIONS")) {
String memberType = curRole.getName(); String memberType = curRole.getName();
topicSubscribers = topicSubscriberReadPlatformService.getSubscribers(entityId, entityType, memberType); topicSubscribers.addAll(topicSubscriberReadPlatformService.getSubscribers(entityId, entityType, memberType));
} }
} }