From 6af66f6ee55cd5763385a23da7a60dcb0a9df138 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 10:03:53 +0800
Subject: [PATCH] 保安员报名修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 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 afc12e3..a189068 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
@@ -1319,6 +1319,12 @@
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
+ if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
+ user.setHold("1");
+ }else {
+ user.setHold("2");
+ }
+
//性别
if (null != userExcel.getSex()) {
if (userExcel.getSex().equals("男")) {
@@ -1335,12 +1341,12 @@
//设置账号
user.setAccount(user.getRealName());
//加密
- if (Func.isNotEmpty(user.getPassword())) {
- user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
- }
+ user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
user.setCreateTime(new Date());
+ user.setUpdateTime(new Date());
user.setDispatch("1");
- user.setExaminationType("0");
+ //待审查
+ user.setExaminationType("2");
//推送内网的数据
User user0 = user;
@@ -1375,7 +1381,7 @@
e.printStackTrace();
}
//调用ftp获取返回数据
- result = Monitor.getFtpDataByUuidList(null);
+ result = Monitor.getFtpDataByUuidList(uuid);
//如果返回true,就退处
if (result.getCode() == 200) {
break;
@@ -1399,13 +1405,16 @@
User user = handlerUserInfo(uuid);
if (result1.getCode()==200){
user.setId(result1.getUserId());
+ this.save(user);
//加入新增集合
- addList.add(user);
+// addList.add(user);
}
if (result1.getCode()==201){
user.setId(result1.getUserId());
+ user.setCreateTime(null);
+ this.updateById(user);
//加入更新集合
- updateList.add(user);
+// updateList.add(user);
}
if (result1.getCode()==202){
status.set(false);
--
Gitblit v1.9.3