|
|
@@ -1003,7 +1003,7 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
//监理合同段，需要获取关联的施工方合同段根节点数据
|
|
|
rootTreeNode = this.wbsTreeContractClient.lazyTree(StringUtils.isNotEmpty(parentId) ? Long.parseLong(parentId) : 0, contractId, contractIdRelation, contractInfo.getContractType());
|
|
|
//设置合同段根节点的名称
|
|
|
- this.setRootNodeName(parentId, rootTreeNode);
|
|
|
+ //this.setRootNodeName(parentId, rootTreeNode);
|
|
|
|
|
|
} else {
|
|
|
if(com.alibaba.nacos.common.utils.StringUtils.isEmpty(parentId)){
|
|
|
@@ -1029,8 +1029,10 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
rootTreeNode.forEach(vo -> {
|
|
|
String primaryKeyId = new Integer("2").equals(contractInfo.getContractType()) ? vo.getId() : vo.getPrimaryKeyId();
|
|
|
|
|
|
- if(StringUtils.isEmpty(parentId) || "0".equals(parentId)){
|
|
|
- vo.setTitle(contractInfo.getContractName());
|
|
|
+ if(new Integer("1").equals(contractInfo.getContractType())){
|
|
|
+ if(StringUtils.isEmpty(parentId) || "0".equals(parentId)){
|
|
|
+ vo.setTitle(contractInfo.getContractName());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//获取上传的图纸
|
liuyc