1 files changed, 9 insertions, 0 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
index 62d95efb..9d612141 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
@@ -170,10 +170,19 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
 											
 				 							if(sql!=null && sql.trim().length()>0){
 				 								 if(name.equals(ff.getFieldName())){
+				 									 if(value.equalsIgnoreCase("('')")) {
+				 										sql = Utils.replaceInString(sql, "[VALUE]", value);
+				 									 } 
+				 									 else {
 				 									sql = Utils.replaceInString(sql, "[VALUE]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value));
 				 								 }
+				 								 }
 				                               if(name.equals(ff1.getFieldName())){
+				                            	   if(value.equalsIgnoreCase("('')")) {
+				                            		   sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", value); 
+				                            	   } else {
 				                            	   sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value));
+				                            	   }
 			
 				                               } else continue;
 											}