commit code merge pull

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

@@ -10,10 +10,7 @@ import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
-import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
-import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.*;
 import com.viettel.econtact.filter.UserSession;
 import cz.jirutka.rsql.parser.RSQLParser;
 import cz.jirutka.rsql.parser.ast.Node;
@@ -1779,27 +1776,27 @@ public class CustomerServiceImpl implements CustomerService {
                     "       C.CURRENT_ADDRESS currentAddress," +
                     "       C.USERNAME username," +
                     "       C.GENDER gender," +
-                    "       C.COMPANY_NAME companyName" +
+                    "       C.COMPANY_NAME companyName," +
                     "       C.DATE_OF_BIRTH dateOfBirth," +
                     "       C.COMPANY_NAME companyName," +
                     "       C.CUSTOMER_TYPE customerType," +
                     "       C.PLACE_OF_BIRTH placeOfBirth," +
                     "       C.CUSTOMER_TYPE customerType," +
                     "       C.EMAIL email," +
-                    "       C.USERNAME username" +
+                    "       C.USERNAME username," +
                     "       C.NAME name," +
                     "       C.MOBILE_NUMBER mobileNumber," +
                     "       C.SITE_ID siteId," +
                     "       C.STATUS status," +
                     "       CF.FUNCTION_CODE functionCode," +
-                    "       CFO.ACTIVE active" +
+                    "       CF.ACTIVE active," +
                     "       CFO.*");
             stringBuilder.append("FROM CUSTOMER C");
             stringBuilder.append("  INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID");
             stringBuilder.append("   INNER JOIN CUSTOMIZE_FIELDS CF ON CF.CUSTOMIZE_FIELD_ID = CFO.CUSTOMIZE_FIELDS_ID\n" +
                     "WHERE 1 = 1");
 //            stringBuilder.append("     and C.SITE_ID = :p_company_site_id");
-            stringBuilder.append("     and CFO.STATUS = 1");
+            stringBuilder.append("     and CF.STATUS = 1");
             stringBuilder.append("   and active = 1 ");
             stringBuilder.append("  and  CF.FUNCTION_CODE = 'CUSTOMER' ");
             params.put("p_company_site_id", customizeFields.getSiteId());
@@ -1818,6 +1815,8 @@ public class CustomerServiceImpl implements CustomerService {
 
     }
 
+
+
     @Override
     public ResultDTO searchCustomizeFields(int page, int pageSize, long SiteId ,long campaignId, CustomerQueryDTO customerQueryDTO) {
         ResultDTO resultDTO = new ResultDTO();