Merge remote-tracking branch 'origin/master'

fa20e1a5 · = · 3e9013f4 · f71bc50f · fa20e1a5
Commit fa20e1a5 authored Sep 13, 2019 by =
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java ...ttel/campaign/service/impl/CampaignExecuteServiceImp.java +1 -1

No files found.
--- a/src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
+++ b/src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
@@ -278,7 +278,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                result.setListData(campaignList);

                Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
-                if (agents.getCampaignSystemStatus() != null && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
+                if (agents != null && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
                    campaignSystemStatus = "1";
                    for (CampaignDTO item : campaignList) {
                        if (item.getStatus() == 2 && item.getAgentStatus() == 1) {