From d4ad4cd6c127aa5944685c4aa098e0015139e1a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 23 Nov 2021 22:25:06 +0800
Subject: [PATCH] 1.保安公司查询修改 2.报名列表修改 3.考试列表查询修改 4.保安员导入修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index b8a4132..91c62c4 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -318,6 +318,14 @@
}
}
+ //如果是异常标记
+ if (null!=user.getExaminationType() && !user.getExaminationType().equals("")){
+ if (user.getExaminationType().equals("1")) {
+ //吊销保安证
+ user.setHold("3");
+ }
+ }
+
user.setPassword(user1.getPassword());
userService.updateById(user);
String rtime;
@@ -394,6 +402,7 @@
+ ",registered = " + "'" + user.getRegistered() + "'"
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ ",hold = " + "'" + user.getHold() + "'"
+ + ",cell = " + "'" + user.getCell() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -904,14 +913,21 @@
if (null!=user.getCell() && !user.getCell().equals("")) {
if (user.getCell().equals("2")){
list.forEach(user2 -> {
- user2.setStatus(2);
- //先将原有人员离职 cell 1:手动录入 2：自动录入
- userService.updateById(user2);
- //内网同步
- String s1 = "update blade_user set status = " + user2.getStatus() +
- " where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //判断是否在本单位，如果是本单位,则不能再次新增
+ if(!user2.getDeptId().equals(user.getDeptId())) {
+ user2.setStatus(2);
+ //先将原有人员离职 cell 1:手动录入 2：自动录入
+ userService.updateById(user2);
+ //内网同步
+ String s1 = "update blade_user set status = " + user2.getStatus() +
+ " where id = " + "'" + user2.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }else {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
});
+ }else {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
}else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
--
Gitblit v1.9.3