From c0025985707e90ef01e4a178691c2609ba0459e5 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 07 七月 2023 10:01:51 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 10aaf9b..cc29bf0 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 @@ -201,7 +201,7 @@ */ private CodeClassify selectByOid(String oid){ - CodeClassify codeClassifyEntity = codeClassifyMapper.selectById(oid.trim()); + CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0); if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){ throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹� } @@ -544,7 +544,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