From 8ab116b4cc31d7177aa11746ced04f61b8fc5520 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 03 六月 2024 16:41:57 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
index 6e5237a..9277c2b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
@@ -64,7 +64,7 @@
         // 鍒嗙被
         // 涓�绾у垎绫�
         if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
-            Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
+            Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2).eq(Tag::getHostId, hostId));
             if (priTag == null) {
                 Tag top = tagService.getTop(hostId);
                 NodeUtils nodeUtils = new NodeUtils();
@@ -90,12 +90,13 @@
                         null,    // 淇敼浜哄憳
                         null    // 澶囨敞
                 );
+                priTag.setHostId(hostId);
                 if (tagMapper.insert(priTag) == 0) {
                     throw new CoolException("淇濆瓨涓�绾у垎绫诲け璐�");
                 }
             }
             // 浜岀骇鍒嗙被
-            Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 3));
+            Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getSecClass()).eq(Tag::getLevel, 3).eq(Tag::getHostId, hostId));
             if (secTag == null) {
                 NodeUtils nodeUtils = new NodeUtils();
                 nodeUtils.executePath(priTag.getId());
@@ -120,6 +121,7 @@
                         null,    // 淇敼浜哄憳
                         null    // 澶囨敞
                 );
+                secTag.setHostId(hostId);
                 if (tagMapper.insert(secTag) == 0) {
                     throw new CoolException("淇濆瓨浜岀骇鍒嗙被澶辫触");
                 }

--
Gitblit v1.9.1