From 8a8d4a3779b13393688f44f6ac5d8fe6d253d369 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 20:40:25 +0800
Subject: [PATCH] 1.保安人员导入
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 99ac878..808e324 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
@@ -302,7 +302,22 @@
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
+ if (userExcel.getStatus().equals("在职")){
+ user.setStatus(1);
+ }
+ else {
+ user.setStatus(2);
+ }
+ if (userExcel.getSex().equals("男性")){
+ user.setSex(1);
+ }
+ else {
+ user.setSex(2);
+ }
user.setRoleId("1412226235153731586");
+ String deptname = user.getDeptId();
+ String id =userDeptService.selectIn(deptname);
+ user.setDeptId(id);
//获取默认密码配置
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
user.setPassword(initPassword);
@@ -452,13 +467,15 @@
public List<TreeNode> getSecurityApplyTree(UserVO user) {
Map<Long,TreeNode> map = baseMapper.getSecurityApplyTree(user);
List<TreeNode> tree = new ArrayList<>();
- map.forEach((id,treeNode) ->{
- if (map.containsKey(treeNode.getParentId())){
- map.get(treeNode.getParentId()).getChildren().add(treeNode);
- }else {
- tree.add(treeNode);
- }
- });
+ 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;
}
@@ -466,4 +483,14 @@
public List<Map<Object, Object>> selectInr(String deptid) {
return baseMapper.selectInr(deptid);
}
+
+ /**
+ * 查询当前年份已有的保安证编号
+ * @param pre 前缀
+ * @return
+ */
+ @Override
+ public int getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
}
--
Gitblit v1.9.3