From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 6d0918e..0b72586 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -214,6 +214,8 @@
Map map = JSON.parseObject(s, Map.class);
Object user = map.get("user");
User user1 = JSON.parseObject(user.toString(), User.class);
+ System.out.println("user1 = " + user1);
+
//获取 uuid
String uuid = user1.getReasonForLeav();
//用户数据校验
@@ -279,6 +281,7 @@
}
Map<String, Object> map1 = new HashMap<>(1);
map1.put(uuid,result1);
+ System.out.println("用户新增：开始向外网推送数据............");
//向外网发送数据
FtpUtil.objectFileUpload(map1);
}
@@ -414,7 +417,10 @@
//2.保安证编号校验
//判断是否持证
boolean states = false;
- if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
+ if (null!= user.getHold()
+ && user.getHold().equals("1")
+ && null!=user.getSecuritynumber()
+ && !user.getSecuritynumber().equals("")){
//持证，校验保安证编号是否合法
SecurityPaper securityPaper = new SecurityPaper();
securityPaper.setIdCardNo(user.getCardid());
--
Gitblit v1.9.3