From 497df0adf57c8a076596fa763cdbe5a554b96b5b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Dec 2021 18:39:46 +0800
Subject: [PATCH] 新增分公司的总公司工商信息管理
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 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 86c6e6c..c74868f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -64,6 +64,8 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.signinrecords.entity.SignInRecords;
import org.springblade.modules.signinrecords.service.SignInRecordsService;
import org.springblade.modules.system.entity.Dept;
@@ -129,6 +131,9 @@
private final TrainingRegistrationService trainingRegistrationService;
private final AccreditationRecordsService accreditationRecordsService;
+
+
+ private final SecurityPaperService securityPaperService;
/**
* 查询单条
@@ -306,6 +311,28 @@
url = split[1];
}
}
+
+ //判断是否持证
+// 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()){
@@ -1071,7 +1098,6 @@
user.setExaminationType("0");
user.setAccount(user.getCardid());
-// Integer userCount = userService.selectCount(user.getAccount());
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
@@ -1108,6 +1134,28 @@
}
}
+ //判断是否持证
+// 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("")) {
if (user.getFingerprint().length()>100) {
@@ -1117,16 +1165,7 @@
url = split[1];
}
}
-// }
- //未持证
-// if (user.getHold().equals("2")){
-// //分配未持证保安角色
-// Role role = new Role();
-// role.setRoleAlias("未持证保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-// user.setRoleId(oneRole.getId().toString());
-// }
-// }
+
//密码加密
if (Func.isNotEmpty(user.getCardid())) {
// user.setPassword(DigestUtil.encrypt(user.getPassword()));
--
Gitblit v1.9.3