hungtt-commit get data combobox field

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java

@@ -91,6 +91,8 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
 
     CampaignCustomer findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(Long campaignId, Long companySiteId, Long customerId);
 
+    List<CampaignCustomer> findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(Long campaignId, Long companySiteId, Long customerId, Long inCampaingStatus);
+
     @Query(value = "select complete_value from campaign_complete_code where status = 1 and is_finish = 0 and is_recall = 0", nativeQuery = true)
     List<Short> getStatus();
 }

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -1653,7 +1653,8 @@ public class CustomerServiceImpl implements CustomerService {
         List<Short> lstStatus = campaignCustomerRepository.getStatus();
         try {
             for (String cusId : lstCusId) {
-                CampaignCustomer entity = campaignCustomerRepository.findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(campaignId, companySiteId, Long.parseLong(cusId));
+                List<CampaignCustomer> listEntity = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(campaignId, companySiteId, Long.parseLong(cusId), 1L);
+                for (CampaignCustomer entity : listEntity) {
                     if (entity.getStatus() == 0) {
                         campaignCustomerRepository.delete(entity);
                     } else if (lstStatus.contains(entity.getStatus())) {
@@ -1661,6 +1662,7 @@ public class CustomerServiceImpl implements CustomerService {
                         campaignCustomerRepository.save(entity);
                     }
                 }
+            }
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
         } catch (Exception e) {