From 69d53c7ab895423869413fd3bff31f118e0f64c7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 15:17:33 +0800
Subject: [PATCH] 1.派遣保安员列表接口修改，去除已派遣的人员 2.派遣单位新增创建时间
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index cb7620a..bf0829f 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -62,6 +62,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
/**
* 服务实现类
@@ -664,7 +665,23 @@
tree.add(treeNode);
}
});
+ //将原有的保安员加入到集合
+ if (null!=user.getId()){
+ TreeNode treeNode = new TreeNode();
+ treeNode.setId(user.getId());
+ treeNode.setHasChildren(false);
+ treeNode.setName(user.getRealName());
+ treeNode.setParentId(Long.parseLong(user.getDeptId()));
+ tree.get(0).getChildren().add(treeNode);
+ }
}
+ //获取子节点
+ List<TreeNode> children = tree.get(0).getChildren();
+ //排序
+ List<TreeNode> nodes = children.stream().sorted(Comparator.comparing(TreeNode::getId)).collect(Collectors.toList());
+ //设置排序后的集合
+ tree.get(0).setChildren(nodes);
+ //返回
return tree;
}
--
Gitblit v1.9.3