From 27eb2df01ab873bc7f1451ff5865ed66b2876159 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:58:59 +0800
Subject: [PATCH] 去掉dmpvar相关的代码
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/CommonGroupServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/CommonGroupServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/CommonGroupServiceImpl.java
index 192e4bb..fd4215f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/CommonGroupServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/smis/service/impl/CommonGroupServiceImpl.java
@@ -520,6 +520,17 @@
}).distinct();
}).collect(Collectors.toList()));
*/
+ list.addAll( workstations.stream().flatMap(o1 -> {
+ Long id = o1.getId();
+ return itemList.stream().filter(o22 -> {
+ Integer distinguish = commonGroupTypeVO.getDistinguish();
+ boolean result = id.equals(o22.getItemId());
+
+ return result;
+ }).map(o23 -> {
+ return WorkstationInGroupVO.builder().id(id).parentId(o23.getGroupId()).title(o1.getName()).code(o1.getCode()).isWorkstation(Boolean.TRUE).isGroup(Boolean.FALSE).avatar(o1.getAvatar()).ftpCatalogue(o1.getFtpCatalogue()).build();
+ }).distinct();
+ }).collect(Collectors.toList()));
return list;
}
--
Gitblit v1.9.3