|
|
@@ -41,6 +41,7 @@ import org.springblade.core.boot.ctrl.BladeController;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 合同段划分树首件关联表 控制器
|
|
|
@@ -204,8 +205,8 @@ public class TreeContractFirstController extends BladeController {
|
|
|
//首先获取当前父节点的下一级子节点
|
|
|
WbsTreeContract parentNode = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(parentId);
|
|
|
List<WbsTreeContractTreeVOS> oneChild = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(nodeData.getContractId(), nodeData.getWbsType(), String.valueOf(parentNode.getId()));
|
|
|
- List<String> ids = new ArrayList<>();
|
|
|
- oneChild.forEach(child -> ids.add(child.getPrimaryKeyId()));
|
|
|
+ //获取唯一键
|
|
|
+ List<String> ids = oneChild.stream().map(WbsTreeContractTreeVOS::getPrimaryKeyId).distinct().collect(Collectors.toList());
|
|
|
//判断是否存在首件标记
|
|
|
List<TreeContractFirst> result = this.treeContractFirstService.list(Wrappers.<TreeContractFirst>lambdaQuery().in(TreeContractFirst::getWbsNodeId, ids).eq(TreeContractFirst::getIsDeleted, 0));
|
|
|
if(result != null && result.size() != 0){
|
huangjn