From 232cd3523ad793243ca5dfc815aca08872890f88 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Sat, 11 May 2024 15:55:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=94=E5=9B=9E=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=AF=B9=E8=B1=A1extras=E6=B7=BB=E5=8A=A0fun?=
 =?UTF-8?q?cCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interactive/service/impl/InteractiveServiceImpl.java       | 10 ++++++----
 .../interactive/service/impl/JumpRouteJoinStrategy.java        |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
index d70bcd4..e596097 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
@@ -209,10 +209,12 @@ public class InteractiveServiceImpl implements IInteractiveService {
             Assert.isTrue(Func.isNotEmpty(function) && StringUtil.isNotBlank(function.getRoute()),() -> {
                 throw new ServiceException("传入函数未获取到菜单，鉴权失败！");
             });
-            R<Boolean> authenticationR = userClient.permissionMenuById(Long.valueOf(userId), function.getRoute());
-            Assert.isTrue(authenticationR.isSuccess() && authenticationR.getData(), () -> {
-                throw new ServiceException("人员菜单鉴权失败！");
-            });
+            if(Func.isNotEmpty(function.getRoute()) && StringUtil.isNotBlank(function.getRoute())) {
+                R<Boolean> authenticationR = userClient.permissionMenuById(Long.valueOf(userId), function.getRoute());
+                Assert.isTrue(authenticationR.isSuccess() && authenticationR.getData(), () -> {
+                    throw new ServiceException("人员菜单鉴权失败！");
+                });
+            }
         }
         return true;
     }
diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java
index e3b7f55..b0deed6 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java
@@ -52,6 +52,7 @@ public class JumpRouteJoinStrategy {
         // 根据hz3000画面版本获取path
         Integer picResource = Integer.valueOf(params.get("picResource"));
         JSONObject pathObject = JSONObject.parseObject(function.getPath());
+        extraVO.setLabel(params.get("name"));
         // 云组态
         if(picResource == 0) {
             String scada = pathObject.getString("scada");