|
@@ -291,6 +291,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
public FormulaDataBlock findFdb(TableElementConverter tec) {
|
|
|
/*查找第一个包含分项评定子节点的父节点*/
|
|
|
Long ancestor = findFirstParentId(tec);
|
|
|
+ ancestor = ancestor == null || ancestor == 0 ? tec.getCurrentNode().getParentId() : ancestor;
|
|
|
FormulaDataBlock fdb = this.formulaDataBlockService.queryOption(tec.getContractId(), ancestor, 0);
|
|
|
if (fdb == null) {
|
|
|
fdb = new FormulaDataBlock();
|