From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录，单位数据内网推送
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 84 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 5 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 119c10c..8dfd6eb 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
@@ -304,9 +304,7 @@
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
// 设置租户ID
- if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
- user.setTenantId(AuthUtil.getTenantId());
- }
+ user.setTenantId("000000");
if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
if (userExcel.getStatus().equals("在职")) {
user.setStatus(1);
@@ -316,10 +314,28 @@
}
if (userExcel.getSex().equals("男性")) {
user.setSex(1);
- } else {
+ }
+ if (userExcel.getSex().equals("女性")){
user.setSex(2);
}
- user.setRoleId("1412226235153731586");
+ //判断是否持证
+ if (null != userExcel.getHold() && userExcel.getHold() != "") {
+ if (userExcel.getHold().equals("是")) {
+ user.setHold("1");
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ if(userExcel.getHold().equals("否")) {
+ user.setHold("2");
+ Role role = new Role();
+ role.setRoleAlias("未持证保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ }
String deptname = user.getDeptId();
String id = userDeptService.selectIn(deptname);
user.setDeptId(id);
@@ -517,4 +533,62 @@
public UserVO getUserAgeById(Long userId) {
return baseMapper.getUserAgeById(userId);
}
+
+ @Override
+ public List<Map<String, Object>> selectUser() {
+ return baseMapper.selectUser();
+ }
+
+ /**
+ * 导入保安员
+ * @param data
+ * @param isCovered
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importSecurity(List<UserExcel> data, Boolean isCovered) {
+ data.forEach(userExcel -> {
+ 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 (null != userExcel.getHold() && userExcel.getHold() != "") {
+ if (userExcel.getHold().equals("是")) {
+ user.setHold("1");
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ if(userExcel.getHold().equals("否")) {
+ user.setHold("2");
+ Role role = new Role();
+ role.setRoleAlias("未持证保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ }
+ if (userExcel.getSex().equals("男性")) {
+ user.setSex(1);
+ } else {
+ user.setSex(2);
+ }
+
+ String deptname = user.getDeptId();
+ String id = userDeptService.selectIn(deptname);
+ user.setDeptId(id);
+ //获取默认密码配置
+ String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+ user.setPassword(initPassword);
+ this.submit(user);
+ });
+ }
}
--
Gitblit v1.9.3