From 7577e0d40354021d70b78d58b712ff8c2e8ad485 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 70f48bc..0a8e9b1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -154,10 +154,10 @@
String puid = "";
if("FunctionObject".equals(menuVO.getModeType())) {
puid = menuVO.getId();
- }else if("modelManagmentNode".equals(menuVO.getId())) {
- puid = "modelManagmentNode";
- }else if("systemManagmentNode".equals(menuVO.getId())) {
- puid = "systemManagmentNode";
+ }else if("business".equals(menuVO.getId())) {
+ puid = "business";
+ }else if("system".equals(menuVO.getId())) {
+ puid = "system";
}
if(Func.isBlank(puid)){
throw new VciBaseException("鏈壘鍒拌鍒犻櫎鐨勬ā鍧楋紒");
@@ -850,7 +850,7 @@
} else {
funObj.id = id;
- funObj.parentId = "modelManagmentNode";
+ funObj.parentId = "business";
fuzhi(funObj,oneData);
fileFunctionDatas.add(funObj);
first=false;
@@ -1300,10 +1300,10 @@
/*String parentId = "";
if(menuVO.getModeType().equals("FunctionObject")) {
parentId = menuVO.getParentId();
- }else if("modelManagmentNode".equals(menuVO.getParentId())) {
- parentId = "modelManagmentNode";
- }else if("systemManagmentNode".equals(menuVO.getParentId())) {
- parentId = "systemManagmentNode";
+ }else if("business".equals(menuVO.getParentId())) {
+ parentId = "business";
+ }else if("system".equals(menuVO.getParentId())) {
+ parentId = "system";
}*/
obj.parentId = menuVO.getParentId();
}else{
@@ -1613,4 +1613,18 @@
}
+ /**
+ * 鑾峰彇鍦ㄧ嚎浜哄憳
+ *
+ * @return
+ */
+ @Override
+ public List<OnlineUserInfo> getOnlineUsers() {
+ try {
+ OnlineUserInfo[] onlinUserInfos = platformClientUtil.getFrameworkService().getOnlineUsers();
+ return Arrays.asList(onlinUserInfos);
+ } catch (PLException e) {
+ throw new VciBaseException(String.valueOf(e.code), e.messages);
+ }
+ }
}
--
Gitblit v1.9.3