From c22539bf51df690e084bb768ab90193b359a07ba Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Wed, 31 May 2023 10:50:10 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E5=B7=A1=E6=A3=80minio=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java  |  1 +
 hzims-service/inspect/pom.xml                                | 12 ++++++------
 .../operational/station/service/impl/StationServiceImpl.java |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java
index 9f4ec0c..a1f2c9c 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java
+++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/aspect/LimitRemindAspect.java
@@ -144,6 +144,7 @@ public class LimitRemindAspect {
 				});
 			}
 		}));
+		executorService.shutdown();
 	}
 
 	/**
diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml
index 6057086..0483db8 100644
--- a/hzims-service/inspect/pom.xml
+++ b/hzims-service/inspect/pom.xml
@@ -131,15 +131,15 @@
             <artifactId>blade-resource-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.minio</groupId>-->
-<!--            <artifactId>minio</artifactId>-->
-<!--            <version>6.0.7</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>6.0.7</version>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-minio</artifactId>
-            <version>5.0.0.RELEASE</version>
+            <version>2.7.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.hnac.hzims</groupId>
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
index e356877..1a06dad 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
@@ -619,7 +619,7 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
         request.setTenantId(AuthUtil.getTenantId());
         request.setFullName(stationEntity.getName());
         request.setDeptName(stationEntity.getName());
-        request.setParentId(stationEntity.getHigherDept());
+        request.setParentId(Func.isNotEmpty(stationEntity.getHigherDept()) ? stationEntity.getHigherDept() : request.getParentId());
         request.setDeptCategory(StationConstants.DeptCategoryEnum.STATION.getValue());
         request.setSort(1);
         R<Void> buildResult = deptClient.createOrUpdateDept(request);