From 77e2302c6db5e8bf708831152b12a40035202ca7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 二月 2024 11:22:10 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
index e548dad..8c1be3d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/NodeUtils.java
@@ -1,9 +1,6 @@
 package com.zy.asrs.wcs.utils;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.framework.common.SpringUtils;
-
 import java.io.Serializable;
 import java.util.function.Function;
 
@@ -17,21 +14,21 @@
     public StringBuilder pathName = new StringBuilder();
 
     public interface NodeSupport<T> {
-        T query();
+        T query(T t);
     }
 
-    public <T, R extends Serializable> void generatePath(Class<T> cls
+    public <T, R extends Serializable> void generatePath0(
+            NodeSupport<T> support
             , T t
-            , Function<? super T, ? extends R> idMapper
+            , Function<? super T, ? extends Long> idMapper
             , Function<? super T, ? extends String> nameMapper
-            , Function<? super T, ? extends R> parentIdMapper) {
-        IService<T> bean = (IService<T>) SpringUtils.getBean(cls.getSimpleName() + "Service");
-        T parent = bean.getById(parentIdMapper.apply(t));
+            , Function<? super T, ? extends Long> parentIdMapper) {
+        T parent = support.query(t);
         if (null != parent) {
             path.insert(0, idMapper.apply(parent)).insert(0,",");
             pathName.insert(0, nameMapper.apply(parent)).insert(0,",");
-            if (parentIdMapper.apply(parent) != null) {
-                generatePath(cls, parent, idMapper, nameMapper, parentIdMapper);
+            if (parentIdMapper.apply(parent) != null && parentIdMapper.apply(parent) != 0) {
+                generatePath0(support, parent, idMapper, nameMapper, parentIdMapper);
             } else {
                 path.deleteCharAt(0);
                 pathName.deleteCharAt(0);
@@ -39,4 +36,5 @@
         }
     }
 
+
 }

--
Gitblit v1.9.1