From 05d45bd440ffc92e14e6c8728ac8956a0488c0ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 07 十二月 2023 17:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index eeaf5e7..0372041 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -11,6 +11,7 @@
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
 import java.io.File;
@@ -53,14 +54,15 @@
 	 * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
 	 * @return 鎵ц缁撴灉
 	 */
-	R addSave(CodeClassify codeClassifyEntity)  ;
+	R addSave(CodeClassify codeClassifyEntity);
 
 	/**
 	 * 淇敼涓婚搴撳垎绫�
 	 * @param codeClassifyEntity 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
 	 * @return 鎵ц缁撴灉
 	 */
-	R editSave(CodeClassify codeClassifyEntity) ;
+	R editSave(CodeClassify codeClassifyEntity);
+
 	/**
 	 * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄�
 	 * @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
@@ -290,8 +292,21 @@
 	/**
 	 * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
 	 * @param oid
+	 * @param fieldInPath
 	 * @return
 	 */
-	List<CodeClassifyVO> selectAllClassifyByOid(String oid);
+	List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath);
 
+	/**
+	 * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍￠獙鐨勫垎绫籵id
+	 * @param topOid
+	 * @param currentOid
+	 * @return
+	 */
+	String selectLeafByParentClassifyOid(String topOid, String currentOid);
+
+	/**
+	 * 娴佹按渚濊禆鐢熸垚
+	 */
+	R flowingDependencyGen(String classifyOid);
 }

--
Gitblit v1.9.3