From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +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/OsActionServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
index 0a8fec3..38249fc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
@@ -241,6 +241,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().savePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇濆瓨澶辫触锛侊紒"});
@@ -274,6 +275,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇敼澶辫触锛侊紒"});
@@ -299,6 +301,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"鍒犻櫎澶辫触锛侊紒"});
@@ -521,7 +524,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().createPLActionParam(param);
if(message.startsWith("0")) {
@@ -544,7 +547,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().editPLActionParam(param);
if(message.startsWith("0")) {
@@ -586,7 +589,7 @@
List<PLActionParamDTO> dtos = new ArrayList<>();
for (PLActionParam paramArray : paramArrays) {
PLActionParamDTO dto = new PLActionParamDTO();
- dto.setAction(paramArray.action);
+ dto.setActionOid(paramArray.action);
dto.setOid(paramArray.oid);
dto.setName(paramArray.name);
dto.setDescription(paramArray.description);
--
Gitblit v1.9.3