From 0d084ca2ac3c2571219c263fba9f5f813a714e49 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Dec 2021 15:15:10 +0800
Subject: [PATCH] 制证申请导出修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 4385e20..f68f678 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
@@ -835,6 +835,10 @@
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
}
+ //身份证住址校验
+ if (null==user.getRegistered() || user.getRegistered().equals("")){
+ throw new ServiceException("导入失败!身份证住址不能为空!");
+ }
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
String cardid = user.getCardid().replaceAll(" ", "");
@@ -1066,7 +1070,7 @@
@Override
public void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId) {
-//将不能导入的保安员账号存起来
+ //将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
//将需要新增的保安员信息存入集合
List<String> ageErrorList = new ArrayList<>();
@@ -1091,10 +1095,14 @@
throw new ServiceException("导入失败!公司名:["+user.getDeptId()+"]不存在!");
}
- //身份证校验
+ //身份证号码校验
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
}
+ //身份证住址校验
+ if (null==user.getRegistered() || user.getRegistered().equals("")){
+ throw new ServiceException("导入失败!身份证住址不能为空!");
+ }
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
String cardid = user.getCardid().replaceAll(" ", "");
--
Gitblit v1.9.3