hungtt-commit get data combobox field

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

@@ -91,7 +91,7 @@ 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);
+    List<CampaignCustomer> findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(Long campaignId, Long companySiteId, Long customerId, Short 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,7 @@ public class CustomerServiceImpl implements CustomerService {
         List<Short> lstStatus = campaignCustomerRepository.getStatus();
         try {
             for (String cusId : lstCusId) {
-                List<CampaignCustomer> listEntity = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(campaignId, companySiteId, Long.parseLong(cusId), 1L);
+                List<CampaignCustomer> listEntity = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(campaignId, companySiteId, Long.parseLong(cusId), (short) 1);
                 for (CampaignCustomer entity : listEntity) {
                     if (entity.getStatus() == 0) {
                         campaignCustomerRepository.delete(entity);