|
@@ -373,7 +373,7 @@ public class WbsParamController {
|
|
Formula finalFormula = formula;
|
|
Formula finalFormula = formula;
|
|
String name=e.getName().replace("【水】","").trim();
|
|
String name=e.getName().replace("【水】","").trim();
|
|
finalElementMap.forEach(m->{
|
|
finalElementMap.forEach(m->{
|
|
- if(m.get("name").toString().contains(name)){
|
|
|
|
|
|
+ if(StringUtils.handleNull(m.get("name")).contains(name)){
|
|
/*匹配名称,且该元素没有绑定任何节点参数公式*/
|
|
/*匹配名称,且该元素没有绑定任何节点参数公式*/
|
|
if(longList.stream().noneMatch(k->StringUtils.isEquals(k,m.get("id")))){
|
|
if(longList.stream().noneMatch(k->StringUtils.isEquals(k,m.get("id")))){
|
|
ElementFormulaMapping efm = new ElementFormulaMapping();
|
|
ElementFormulaMapping efm = new ElementFormulaMapping();
|