From 9936c2c1aeebc91b6242083826ef48d77ea03032 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 12 九月 2024 17:44:53 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 fd3d7b9..1030cb5 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
@@ -127,6 +127,7 @@
PLActionCls[] clses = platformClientUtil.getUIService().getPLActionClsArray();
PLActionClsDTO treDto = new PLActionClsDTO();
treDto.setName("Action鍒嗙被");
+ treDto.setId("root");
Map<String, List<PLActionCls>> allDataMap = Arrays.stream(clses).collect(Collectors.groupingBy(pl -> pl.pid));
for (PLActionCls cls : clses) {
@@ -134,7 +135,7 @@
PLActionClsDTO parentDto = new PLActionClsDTO();
parentDto.setId(cls.id);
parentDto.setName(cls.name);
- parentDto.setPid(cls.pid);
+ parentDto.setPid("root");
parentDto.setDescription(cls.description);
parentDto.setCreator(cls.creator);
parentDto.setCreateTime(cls.createTime);
@@ -186,7 +187,7 @@
Constraint[] consArray ;
if(StringUtils.isNotBlank(dto.getPlactioncls())){
consArray = new Constraint[7];
- consArray[6] = new Constraint("plactioncls", dto.getPlactioncls());
+ consArray[6] = new Constraint("plactioncls", dto.getPlactioncls().equals("root") ? "": dto.getPlactioncls());
}else {
consArray = new Constraint[6];
}
--
Gitblit v1.9.3