From 5b59d04408cc6602fcb9edd2544f62bef709b8b1 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 15 一月 2025 11:53:08 +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/WebIconServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
index 75ca637..53b7ac3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
@@ -81,6 +81,7 @@
icon.content = iconContent;
icon.type = type;
icon.groups = groups;
+ icon.plModifyUser = WebUtil.getCurrentUserId();
updateList.add(icon);
}else{
PLIcon icon = new PLIcon();
@@ -89,6 +90,7 @@
icon.content = iconContent;
icon.type = type;
icon.groups = groups;
+ icon.plCreateUser = WebUtil.getCurrentUserId();
addList.add(icon);
}
}
@@ -121,7 +123,8 @@
plIcon.content = iconContent;
plIcon.type = iconDTO.getType();
plIcon.groups = iconDTO.getGroups();
-
+ plIcon.plCreateUser = WebUtil.getCurrentUserId();
+ plIcon.plModifyUser = WebUtil.getCurrentUserId();
try {
PortalServicePrx portalServicePrx = platformClientUtil.getPortalService();
portalServicePrx.savePLIcon(plIcon);
@@ -154,6 +157,9 @@
plIcon.content = iconContent;
plIcon.type = iconDTO.getType();
plIcon.groups = iconDTO.getGroups();
+ plIcon.plCreateUser = iconDTO.getPlCreateUser();
+ plIcon.plCreateTime = iconDTO.getPlCreateTime();
+ plIcon.plModifyUser = WebUtil.getCurrentUserId();
portalServicePrx.updatePLIcon(plIcon);
} catch (Exception e) {
throw new RuntimeException(e);
@@ -244,6 +250,10 @@
vo.setContent(icon.content);
vo.setType(icon.type);
vo.setGroups(icon.groups);
+ vo.setPlCreateTime(icon.plCreateTime);
+ vo.setPlCreateUser(icon.plCreateUser);
+ vo.setPlModifyTime(icon.plModifyTime);
+ vo.setPlModifyUser(icon.plModifyUser);
String[] nameArr = icon.name.split(":");
if(nameArr.length > 1){
vo.setLable(nameArr[0]);
--
Gitblit v1.9.3