|
@@ -499,7 +499,6 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
|
|
|
countMap.put(key, 1L);
|
|
|
}
|
|
|
}
|
|
|
- List<String> finalStrings = strings;
|
|
|
List<WbsTreeContractTreeAllVO> wbsTreeContractTreeAllVOS = wbsTreeContractList.stream()
|
|
|
.map(node -> {
|
|
|
WbsTreeContractTreeAllVO vo = BeanUtil.copyProperties(node, WbsTreeContractTreeAllVO.class);
|
|
@@ -520,9 +519,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
|
|
|
vo.setColorStatus(lowestNode.getColorStatus());
|
|
|
}
|
|
|
}
|
|
|
- if(CollectionUtil.isNotEmpty(finalStrings)){
|
|
|
+ if(CollectionUtil.isNotEmpty(syncPKeyIds)){
|
|
|
//判断是否展示同步标识
|
|
|
- vo.setIsSync(finalStrings.contains(vo.getPrimaryKeyId()) ? 1 : 0);
|
|
|
+ vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
|
|
|
}
|
|
|
}
|
|
|
return vo;
|
|
@@ -652,7 +651,6 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
|
|
|
countMap.put(key, 1L);
|
|
|
}
|
|
|
}
|
|
|
- List<String> finalStrings = strings;
|
|
|
List<WbsTreeContractTreeAllVO> wbsTreeContractTreeAllVOS = wbsTreeContractList.stream()
|
|
|
.map(node -> {
|
|
|
WbsTreeContractTreeAllVO vo = BeanUtil.copyProperties(node, WbsTreeContractTreeAllVO.class);
|
|
@@ -672,9 +670,9 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
|
|
|
vo.setColorStatus(lowestNode.getColorStatus());
|
|
|
}
|
|
|
}
|
|
|
- if(CollectionUtil.isNotEmpty(finalStrings)){
|
|
|
+ if(CollectionUtil.isNotEmpty(syncPKeyIds)){
|
|
|
//判断是否展示同步标识
|
|
|
- vo.setIsSync(finalStrings.contains(vo.getPrimaryKeyId()) ? 1 : 0);
|
|
|
+ vo.setIsSync(syncPKeyIds.contains(vo.getPrimaryKeyId()) ? 1 : 0);
|
|
|
}
|
|
|
}
|
|
|
return vo;
|