Merge branch 'cc_20250228_fix_export_bug' into 'master'

fix

See merge request hangzhou/java/custom_zxjp!49
This commit is contained in:
苏竹红
2025-02-28 01:56:23 +00:00
2 changed files with 6 additions and 0 deletions

View File

@@ -259,6 +259,9 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
} }
private List<Date> JsonToDate(String json) { private List<Date> JsonToDate(String json) {
if (StringUtils.isBlank(json)){
return new ArrayList<>();
}
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
// 解析JSON字符串为JsonNode对象 // 解析JSON字符串为JsonNode对象
JsonNode jsonNode = null; JsonNode jsonNode = null;

View File

@@ -383,6 +383,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
} }
private List<Date> JsonToDate(String json) { private List<Date> JsonToDate(String json) {
if (StringUtils.isBlank(json)){
return new ArrayList<>();
}
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
// 解析JSON字符串为JsonNode对象 // 解析JSON字符串为JsonNode对象
JsonNode jsonNode = null; JsonNode jsonNode = null;