From dacafac0449f8df3ef7637a7ed05fa6270964f16 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 16:19:45 +0800
Subject: [PATCH] ftp 修改,新增保安员培训报名校验,新增押运员批量导入校验,批量导入保安员优化

---
 src/main/java/org/springblade/modules/FTP/DataHandler.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index d33b154..e9320d1 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -51,14 +51,17 @@
 	 */
 	public static Result handlerList(String json, String uuid) {
 		Map map = JSON.parseObject(json, Map.class);
+		System.out.println("map = " + map);
 		//获取结果
 		Object o = map.get(uuid);
+		System.out.println("o = " + o);
 		if (null== o || o.equals("")){
 			return new Result(400,null,"uuid 不匹配",null);
 		}else {
 			//转换
-			List<Result> results = JSON.parseArray(o.toString(), Result.class);
-			return new Result(200,"成功响应数据",results);
+			Result result = JSON.parseObject(o.toString(), Result.class);
+			System.out.println("result = " + result);
+			return result;
 		}
 	}
 
@@ -162,6 +165,9 @@
 		user1.setNativeplace("");
 		user1.setEducation("");
 		user1.setPoliticaloutlook("");
+		user1.setMyPicture("");
+		user1.setHeight("");
+		user1.setRtime(null);
 		//返回
 		return user1;
 	}

--
Gitblit v1.9.3