From ba3fb30afc7c163329d0ee71b23db67b70837c57 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 18:08:15 +0800
Subject: [PATCH] 保安员证编号校验规则修改

---
 src/main/java/org/springblade/modules/FTP/DataHanlder.java |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 4040773..22c1446 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -123,27 +123,29 @@
 				user.setUpdateTime(new Date());
 				user.setUserType(7);
 				//更新保安数据
-				hanlder.userService.updateById(user);
+				boolean flag = hanlder.userService.updateById(user);
 
-				//生成保安证的同时向保安证管理表中插入一条数据
-				SecurityPaper securityPaper = new SecurityPaper();
-				securityPaper.setUserId(user.getId());
-				securityPaper.setNumber(result);
-				securityPaper.setCreateTime(new Date());
-				securityPaper.setIdCardNo(user.getCardid());
-				securityPaper.setPeopleName(user.getRealName());
-				securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
-				securityPaper.setApplyId(examScore.getApplyId());
-				securityPaper.setSource(1);
-				hanlder.securityPaperService.save(securityPaper);
+				if (flag) {
+					//生成保安证的同时向保安证管理表中插入一条数据
+					SecurityPaper securityPaper = new SecurityPaper();
+					securityPaper.setUserId(user.getId());
+					securityPaper.setNumber(result);
+					securityPaper.setCreateTime(new Date());
+					securityPaper.setIdCardNo(user.getCardid());
+					securityPaper.setPeopleName(user.getRealName());
+					securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
+					securityPaper.setApplyId(examScore.getApplyId());
+					securityPaper.setSource(1);
+					hanlder.securityPaperService.save(securityPaper);
 
-				//内网同步
-				String s1 = "update blade_user set hold = " + "'" + user.getHold() + "'" +
-					",securitynumber = " + "'" + DesensitizedUtil.desensitizedSecurityNumber(result) + "'" +
-					",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
-					",user_type = " + "'" + user.getUserType() + "'" +
-					" " + "where id = " + "'" + user.getId() + "'";
-				hanlder.myAsyncService.FTP(s1);
+					//内网同步
+					String s1 = "update blade_user set hold = " + "'" + user.getHold() + "'" +
+						",securitynumber = " + "'" + DesensitizedUtil.desensitizedSecurityNumber(result) + "'" +
+						",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+						",user_type = " + "'" + user.getUserType() + "'" +
+						" " + "where id = " + "'" + user.getId() + "'";
+					hanlder.myAsyncService.FTP(s1);
+				}
 			}
 		}
 	}
@@ -789,7 +791,8 @@
 			String number = user.getSecuritynumber().substring(6);
 			if (pre.equals("赣洪2022")){
 				int num = Integer.parseInt(number);
-				if (num>=22110 && num<=23110){
+				if (num>=21000 && num<=23000){
+					user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
 					return new Result(200,null,"",user);
 				}
 			}

--
Gitblit v1.9.3