From a445f592f22bc3f1bb7fe18ef80352c9f49f408c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 13:50:12 +0800
Subject: [PATCH] 派遣人员查询接口新增修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 eba795a..bb50959 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
@@ -471,11 +471,17 @@
user2.setHold("2");
}
}
+ if (null!=userExcel.getRegistered()){
+ user2.setRegistered(userExcel.getRegistered());
+ }else {
+ user2.setRegistered("");
+ }
//更新用户数据
this.updateById(user2);
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ + ",registered = " + "'" + user2.getRegistered() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
@@ -627,6 +633,28 @@
@Override
public List<TreeNode> getSecurityApplyTree(UserVO user) {
Map<Long, TreeNode> map = baseMapper.getSecurityApplyTree(user);
+ List<TreeNode> tree = new ArrayList<>();
+ if (map.size() > 1) {
+ map.forEach((id, treeNode) -> {
+ if (map.containsKey(treeNode.getParentId())) {
+ map.get(treeNode.getParentId()).getChildren().add(treeNode);
+ } else {
+ tree.add(treeNode);
+ }
+ });
+ }
+ return tree;
+ }
+
+ /**
+ * 派遣保安员列表树 安员列表树，帅选无保安证,下拉tree
+ *
+ * @param user 用户信息
+ * @return
+ */
+ @Override
+ public List<TreeNode> getSecurityDispatcherTree(UserVO user) {
+ Map<Long, TreeNode> map = baseMapper.getSecurityDispatcherTree(user);
List<TreeNode> tree = new ArrayList<>();
if (map.size() > 1) {
map.forEach((id, treeNode) -> {
@@ -883,4 +911,7 @@
}
});
}
+
+
+
}
--
Gitblit v1.9.3