|
@@ -652,7 +652,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
|
|
|
if (tec.getCurrentNode().getDivisional().size() == 0) {
|
|
|
// List<Map<String,Object>> listMaps=this.jdbcTemplate.queryForList("select b.p_Key_id pkId,b.id from m_wbs_tree_contract a join m_wbs_tree_contract b on (a.contract_id=b.contract_id and b.ancestors like CONCAT(a.ancestors,'%')) where a.p_key_id="+tec.getCurrentNode().getPkId()+" and b.is_deleted=0 and b.node_type=6 ORDER BY b.sort");
|
|
|
List<Map<String, Object>> listMaps = new ArrayList<>();
|
|
|
- descendantType46(tec.getCurrentNode().getPkId(),tec.getCurrentNode().getContractId(), listMaps);
|
|
|
+ descendantType46(tec.getCurrentNode().getParentPkeyId(),tec.getCurrentNode().getContractId(), listMaps);
|
|
|
if (listMaps.size() > 0) {
|
|
|
tec.getCurrentNode().getDivisional().addAll(listMaps.stream().map(m -> BeanUtil.toBean(m, CurrentNode.class)).collect(Collectors.toList()));
|
|
|
}
|