From 298655c560cd54e088d6e11affda9d169f5e2b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 16:34:00 +0800
Subject: [PATCH] 导入接口修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 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 fa6b645..8657224 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
@@ -305,19 +305,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- }
- if (userExcel.getSex().equals("女性")){
- user.setSex(2);
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -336,12 +325,19 @@
user.setRoleId(oneRole.getId().toString());
}
}
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
+ }
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
@@ -551,13 +547,8 @@
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
user.setTenantId("000000");
- if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
- if (userExcel.getStatus().equals("在职")) {
- user.setStatus(1);
- } else {
- user.setStatus(2);
- }
- }
+ //默认在职
+ user.setStatus(1);
//判断是否持证
if (null != userExcel.getHold() && userExcel.getHold() != "") {
if (userExcel.getHold().equals("是")) {
@@ -576,18 +567,19 @@
user.setRoleId(oneRole.getId().toString());
}
}
- if (userExcel.getSex().equals("男性")) {
- user.setSex(1);
- } else {
- user.setSex(2);
+ if (null!=userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
}
-
- String deptname = user.getDeptId();
- String id = userDeptService.selectIn(deptname);
- user.setDeptId(id);
+ //设置部门id
+ user.setDeptId(userDeptService.selectIn(user.getDeptId()));
//获取默认密码配置
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
+ //新增
this.submit(user);
});
}
--
Gitblit v1.9.3