From ddebcfaf85cbb400668f38b1efd82e439c6e1012 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:39:43 +0800
Subject: [PATCH] 报名考试接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 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 8e2f2f1..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;
}
--
Gitblit v1.9.3