yangyj пре 2 година
родитељ
комит
8a4f0e42cc

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -473,6 +473,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 					if(StringUtils.isNotEmpty(keyname)){
 						String[] keys = keyname.split("__");
 						String datakey = keys[0];
+						keyVal=keys[1];
 //						if(dataMap.containsKey(keys[0])){
 //							String datakeyVal = dataMap.get(datakey)+";"+keyVal;
 //						}else{

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsParamServiceImpl.java

@@ -43,6 +43,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             StaticLog.info("获取节点{}文件题名",nodeId);
             List<WbsTreeContract> nodes = treeContractService.searchParentAllNode(nodeId,contractId);
             if(Func.isNotEmpty(nodes)){
+                wbsTreeContract.setNodeName(wbsTreeContract.getFullName());
                 nodes.set(0,wbsTreeContract);
                 WbsParam wp = this.getOne(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getWbsId,nodeId).eq(WbsParam::getK,FILE_TITLE));
                 if(Func.isNotEmpty(wp)){