From 7f863f2bebf55d5735d8fc7556f74e463d81b983 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 29 十一月 2023 12:42:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 5bfd13b..56d77fd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1070,7 +1070,7 @@
}
});
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage();
/* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
XMLResultSystemVO.setErrorid(errorid);
@@ -1220,10 +1220,10 @@
throw new Throwable(msg);
}
} else {
- TreeQueryObject treeQueryObject = new TreeQueryObject();
+ /*TreeQueryObject treeQueryObject = new TreeQueryObject();
treeQueryObject.setParentOid(oid);
- treeQueryObject.setQueryAllLevel(true);
- codeClassifyVOS = classifyService.selectCodeClassifyDOByTree(treeQueryObject);
+ treeQueryObject.setQueryAllLevel(true);*/
+ codeClassifyVOS = classifyService.getIdPathToNamePathByParentId(oid,false);
}
}else{
errorid = "101";
@@ -1243,7 +1243,7 @@
classifyVO.setDescription(codeClassifyDO.getDescription());
classifyVO.setName(codeClassifyDO.getName());
classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
- classifyVO.setFullPathName(codeClassifyDO.getPath());
+ classifyVO.setFullPathName(codeClassifyDO.getNamePath());
classifyVOList.add(classifyVO);
});
libraryVo.setClassify(classifyVOList);
@@ -1254,7 +1254,7 @@
issucess=true;
resultData.setLibrary(libraryVo);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
}finally {
resultData.setErrorid(errorid);
@@ -1381,7 +1381,7 @@
TreeQueryObject treeQueryObject=new TreeQueryObject();
treeQueryObject.setParentOid(oid);
treeQueryObject.setQueryAllLevel(true);
- dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid);//.selectCodeClassifyDOByTree(treeQueryObject);
+ dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid,"oid");//.selectCodeClassifyDOByTree(treeQueryObject);
//dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
@@ -1473,7 +1473,7 @@
msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅";
}
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
}finally {
resultDataVO.setErrorid(errorid);
@@ -1925,7 +1925,7 @@
issucess=true;
resultClassifyRuleData.setLibrary(resultLibraryVO);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
}finally {
resultClassifyRuleData.setErrorid(errorid);
--
Gitblit v1.9.3