merge code

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -34,7 +34,7 @@ public interface CustomerService {
 
     ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
 
-    CustomerList createCustomerList(CustomerListDTO customerListDTO, String userName);
+    ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName);
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO);
 

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

@@ -1222,7 +1222,7 @@ public class CustomerServiceImpl implements CustomerService {
             result = BundleUtils.getLangString("customer.phoneMax50", locale);
         }
         for (int i = 0; i < str.length(); i++) {
-            CustomerContact cc = customerContactRepository.findCustomerContactByContactTypeAndContactAndIsDirectLine((short) 5, arr[i], (short) 1);
+            CustomerContact cc = customerContactRepository.findCustomerContactByContactEquals(arr[i]);
             if (cc != null) {
                 return result.concat(BundleUtils.getLangString("customer.phoneExists", locale));
             }