From 9ec5c36c39d01119918a17f761a49fb133a5c630 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 09 Mar 2022 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 432472f..8369b2b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -324,25 +324,31 @@
}
//判断是否持证
+ boolean states = false;
if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
//持证，校验保安证编号是否合法
SecurityPaper securityPaper = new SecurityPaper();
securityPaper.setIdCardNo(user.getCardid());
List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
if (securityPaperList.size()>0){
- boolean status = false;
//遍历
for (SecurityPaper paper : securityPaperList) {
if (paper.getNumber().equals(user.getSecuritynumber())){
- status = true;
+ states = true;
}
}
- if (!status){
- throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ if (!states){
+ user.setHold("2");
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
}
}else {
- throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+// throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ states = false;
+ user.setHold("2");
}
+ }
+ if (user.getHold().equals("2")){
+ states = true;
}
//如果是离职
@@ -555,7 +561,10 @@
//FtpUtil.sqlFileUpload(s1);
myAsyncService.FTP(s1);
}
- return R.success("修改成功");
+ if (!states) {
+ return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"修改成功!");
}
@@ -1208,25 +1217,29 @@
}
//判断是否持证
+ boolean state = false;
if (user.getHold().equals("1")){
//持证，校验保安证编号是否合法
SecurityPaper securityPaper = new SecurityPaper();
securityPaper.setIdCardNo(user.getCardid());
List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
if (securityPaperList.size()>0){
- boolean status = false;
//遍历
for (SecurityPaper paper : securityPaperList) {
if (paper.getNumber().equals(user.getSecuritynumber())){
- status = true;
+ state = true;
}
}
- if (!status){
- throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ if (!state){
+ user.setHold("2");
+ user.setSecuritynumber(null);
}
}else {
- throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ user.setHold("2");
+ user.setSecuritynumber(null);
}
+ }else {
+ state = true;
}
String url = "";
@@ -1354,7 +1367,10 @@
// }
// }
//判断是否持证是否为空
- return R.status(status);
+ if (!state) {
+ return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ return R.data(200,null,"新增成功!");
}
/**
--
Gitblit v1.9.3