x

src/main/java/com/egolm/film/api/service/impl/ExportServiceImpl.java

@@ -611,6 +611,7 @@ public class ExportServiceImpl implements ExportService {
     		stringVars.put("24,5", filmExt.getDirector_biography_en());
             for(String key : stringVars.keySet()) {
             	String value = stringVars.get(key);
+            	value = value == null ? "" : value;
             	String[] row_col_ary = key.split(",", 2);
             	Integer row = Integer.valueOf(row_col_ary[0]);
             	Integer col = Integer.valueOf(row_col_ary[1]);
@@ -622,7 +623,7 @@ public class ExportServiceImpl implements ExportService {
                 		if(tplValue.matches("_+")) {
                 			cell.setCellValue(value);
                 		} else if(tplValue.matches("(.+)?(_+)(.+)?")) {
-                			cell.setCellValue(tplValue.replaceFirst("_+", value));
+                			
                 		} else {
                 			cell.setCellValue(value);
                 		}