Merge branch 'master' into tubn

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java

@@ -543,7 +543,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append("     select column_name columnName, null customizeFieldId, 1 isFix from user_tab_columns, dual");
             sb.append("     where table_name = 'CUSTOMER'");
             sb.append(" )");
-            sb.append(" select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)");
+            sb.append(" select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where campaign_id = :p_campaign_id and column_name is not null)");
             sb.append(" union all");
             sb.append(" select title columnName, customize_field_id customizeFieldId, 0 isFix from customize_fields, dual");
             sb.append(" where function_code = 'CUSTOMER'");