Merge remote-tracking branch 'origin/master'

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

@@ -91,6 +91,6 @@ public interface CustomerService {
 ////    List<CustomizeFields> searchCustomize();
     ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
 
-    ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO);
+    ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO, UserSession userSession);
 
 }

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

@@ -2275,7 +2275,7 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO) {
+    public ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO, UserSession userSession) {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -2322,7 +2322,7 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append(" left join customize_field_object cfo on c.customer_id = cfo.object_id and cfo.status = 1");
             sb.append("  AND C.STATUS = 1");
             sb.append("   AND C.customer_id not in (select customer_id from campaign_customer where campaign_id = :p_campaign_id) ");
-            sb.append(" where 1 = 1 ");
+            sb.append(" where 1 = 1  AND C.STATUS = 1 AND C.SITE_ID = :p_site_id ");
 
             List<CustomerQueryDTO> customerDTOList = campaignCustomerDTO.getListQuery();
             if (customerDTOList.get(0).getField() > 0) {// field dong
@@ -2445,6 +2445,7 @@ public class CustomerServiceImpl implements CustomerService {
             query.addScalar("description", new StringType());
 
             query.setParameter("p_campaign_id", campaignCustomerDTO.getCampaignId());
+            query.setParameter("p_site_id", userSession.getSiteId());
 
             query.setResultTransformer(Transformers.aliasToBean(CustomerDTO.class));
 

src/main/java/com/viettel/campaign/web/rest/CustomerController.java

@@ -310,8 +310,9 @@ public class CustomerController {
 
     @PostMapping("/searchIndividualCustomer")
     @ResponseBody
-    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO) {
-        ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO);
+    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO, HttpServletRequest request) {
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
+        ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO, userSession);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }