From 9cead0735df7fd763f536408f76dec4e5e5bb2c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 12:39:08 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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..7c4d378 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
@@ -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);
--
Gitblit v1.9.3