diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java index a7e90d8f..57a69cce 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/service/CoalParameterDefService.java @@ -193,9 +193,15 @@ public class CoalParameterDefService inputStream, new TypeReference>() {}); coalParameterDefs.forEach(x -> x.setOrganizationId(orgId)); + coalParameterDefs.forEach( + x -> x.setInputType(StringUtils.defaultIfBlank(x.getInputType(), "0"))); this.repository.saveAll(coalParameterDefs); } + + this.repository.findAll().stream() + .filter(x -> StringUtils.equals(x.getInputType(), "1")) + .forEach(this::updateFormula); } } } diff --git a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java index 63178c02..0e937f9b 100644 --- a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java +++ b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java @@ -37,6 +37,8 @@ public class OrganizationService extends BaseService