From f244272cd66b2adcd367f07cb3f0cd89f51df17d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 16:37:14 +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, 5 insertions(+), 3 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 8bbb12d..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
@@ -47,7 +47,7 @@
 import org.slf4j.LoggerFactory;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.launch.constant.AppConstant;
-import com.vci.ubcs.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -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