From a7fadd7d4f105ebd7c9ae855a8edb6786292e60c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 19 Aug 2024 15:17:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088604=20=E5=A4=96=E6=9D=A5=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9E=81=E9=99=90=E5=80=BC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/util/ImportUtil.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index bcd39c57..5f9f7d08 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -402,11 +402,13 @@ public class ImportUtil {
             String[] splitValue = value.split("/");
             List<LawsTreeNode> lawsTreeNodes = treeNodeMap.get(splitValue[splitValue.length - 1]);
             if (lawsTreeNodes != null) {
-                if (lawsTreeNodes.size() == 1) return true;
+                if (lawsTreeNodes.size() == 1) continue;
                 if (lawsTreeNodes.size() > 1) {
                     // 叶子节点名称重复，需要寻找全路径
                     String nodeId = treeNodePathMap.get(value);
-                    return StrUtil.isNotBlank(nodeId);
+                    if (StrUtil.isBlank(nodeId)) {
+                        return false;
+                    }
                 }
             } else {
                 return false;
@@ -472,11 +474,13 @@ public class ImportUtil {
             String[] splitValue = value.split("/");
             List<SysDepart> sysDeparts = sysDepartMap.get(splitValue[splitValue.length - 1]);
             if (sysDeparts != null) {
-                if (sysDeparts.size() == 1) return true;
+                if (sysDeparts.size() == 1) continue;
                 if (sysDeparts.size() > 1) {
                     // 叶子节点名称重复，需要寻找全路径
                     String nodeId = sysDepartPathMap.get(value);
-                    return StrUtil.isNotBlank(nodeId);
+                    if (StrUtil.isBlank(nodeId)) {
+                        return false;
+                    }
                 }
             } else {
                 return false;