Commit 01e575da by zhangxingmin

push

parent 46455d31
...@@ -302,16 +302,14 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService { ...@@ -302,16 +302,14 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService {
for (String header : headers) { for (String header : headers) {
String value = getStringValue(row, header); String value = getStringValue(row, header);
if (StringUtils.isNotBlank(value)) { Map<String, String> variableMap = new HashMap<>();
Map<String, String> variableMap = new HashMap<>(); // 中文变量字段名
// 中文变量字段名 variableMap.put("cn_key", header);
variableMap.put("cn_key", header); // 英文变量字段名(需要转换,根据中文名查变量表转换)
// 英文变量字段名(需要转换,根据中文名查变量表转换) variableMap.put("en_key", convertToEnKey(header,emailVariableList));
variableMap.put("en_key", convertToEnKey(header,emailVariableList)); // 占位符内容
// 占位符内容 variableMap.put("content", value);
variableMap.put("content", value); variableList.add(variableMap);
variableList.add(variableMap);
}
} }
return CollectionUtils.isEmpty(variableList) ? null : JSON.toJSONString(variableList); return CollectionUtils.isEmpty(variableList) ? null : JSON.toJSONString(variableList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment