From 99ef2c53e2b64b8ba342eb2abebfab28ccc31b9d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 14:19:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 621622b..4328924 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -117,9 +117,6 @@
return codeClassifyMapper.selectObjs(wrapper);
}
-
-
-
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
@@ -200,7 +197,6 @@
* @return 鏁版嵁瀵硅薄
*/
private CodeClassify selectByOid(String oid){
-
CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
@@ -544,7 +540,9 @@
*/
@Override
public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
- return codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassify> doList= codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
}
--
Gitblit v1.9.3