From 56f96d55c449a72ff40abc0c0c6fe71f7737bb55 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 05 Mar 2022 20:45:19 +0800
Subject: [PATCH] myAncsy 修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 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 cacc138..432472f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -324,26 +324,26 @@
}
//判断是否持证
-// 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;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ 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;
+ }
+ }
+ if (!status){
+ throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }else {
+ throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }
//如果是离职
if (null != user.getStatus()) {
@@ -1208,26 +1208,26 @@
}
//判断是否持证
-// 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;
-// }
-// }
-// if (!status){
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }else {
-// throw new ServiceException("保安证编号不匹配,请核实!");
-// }
-// }
+ 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;
+ }
+ }
+ if (!status){
+ throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }else {
+ throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ }
String url = "";
if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
--
Gitblit v1.9.3