|
@@ -76,7 +76,7 @@ public class NeiWaiYeProgressController {
|
|
|
queryProcessDataVOList.addAll(this.informationQueryService.queryProcessDataByParentIdAndContractId2(contract.getId().toString(), classFy, contractId));
|
|
|
}
|
|
|
|
|
|
- } else if (!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())) {
|
|
|
+ } else if (!new Integer("6").equals(node.getNodeType()) &&(node.getMajorDataType() == null || !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString()))) {
|
|
|
//查询出节点下所有填报节点
|
|
|
// List<WbsTreeContract> list = this.wbsTreeContractClient.getAllChildren(node.getId(), Long.parseLong(node.getContractId()));
|
|
|
// List<Long> keys = list.stream().map(l -> l.getPKeyId()).collect(Collectors.toList());
|