From b5d91d60a294e1c12a44c79490b761821b3d9f44 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 30 六月 2023 18:05:57 +0800
Subject: [PATCH] 顶层批量申请接口导入完善

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml                          |    3 +--
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java |    5 ++++-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java            |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 4f1778a..205389e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -113,7 +113,7 @@
 	 */
 	List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
 
-	public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+	public List<CodeClassify> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
 
 
 	CodeClassify selectByIdRel(@Param("oid") String oid);
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..e77855d 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
@@ -19,6 +19,7 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
 import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.enums.EnumEnum;
 import com.vci.ubcs.omd.feign.IBtmTypeClient;
@@ -544,7 +545,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;
 	}
 
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 027e480..dd0d4d1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -194,9 +194,8 @@
                 SYS_CONNECT_BY_PATH(name, '#')   as namePath,
                 SYS_CONNECT_BY_PATH(id, '#')   as idPath
         from pl_code_classify  plcodeclassify
-        START WITH parentCodeClassifyOid is null
+        START WITH oid = #{parentId}
         CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
-        where codeclassify0.paths =#{fieldPath}
     </select>
 
 

--
Gitblit v1.9.3