|
@@ -41,9 +41,9 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
|
|
List<WbsTreeContract> nodes = chain(contractId,nodeId,wbsTreeContract.getPKeyId(),wbsTreeContract);
|
|
List<WbsTreeContract> nodes = chain(contractId,nodeId,wbsTreeContract.getPKeyId(),wbsTreeContract);
|
|
if(Func.isNotEmpty(nodes)){
|
|
if(Func.isNotEmpty(nodes)){
|
|
/*优先取私有*/
|
|
/*优先取私有*/
|
|
- WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,wbsTreeContract.getPKeyId()).eq(WbsParam::getK,FILE_TITLE));
|
|
|
|
|
|
+ WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,wbsTreeContract.getPKeyId()).eq(WbsParam::getK,FILE_TITLE).last(" limit 1"));
|
|
if(wp==null){
|
|
if(wp==null){
|
|
- wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,nodeId).eq(WbsParam::getK,FILE_TITLE));
|
|
|
|
|
|
+ wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getNodeId,nodeId).eq(WbsParam::getK,FILE_TITLE).last(" limit 1 "));
|
|
}
|
|
}
|
|
if(Func.isNotEmpty(wp)){
|
|
if(Func.isNotEmpty(wp)){
|
|
return CustomFunction.tree(nodes.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()), wp.getV()).toString();
|
|
return CustomFunction.tree(nodes.stream().map(WbsTreeContract::getNodeName).collect(Collectors.toList()), wp.getV()).toString();
|