From b062ae1ee5a2a360eb9d0db4b500f4f6e1489712 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 27 Apr 2022 14:00:23 +0800
Subject: [PATCH] 用戶同步修改
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 7a792b1..8f96acb 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -50,7 +50,8 @@
//获取 uuid
String uuid = user1.getReasonForLeav();
//用户数据校验
- R result = userCheckOut(user1);
+ Result result = userCheckOut(user1);
+ System.out.println("result = " + result);
//创建返回对象
Result result1 = new Result();
if (result.getCode()==200){
@@ -64,7 +65,7 @@
}else if (result.getCode()==201){
//去修改
user1.setReasonForLeav("");
- User data =(User) result.getData();
+ User data = result.getUser();
user1.setId(data.getId());
hanlder.userService.updateById(user1);
//设置返回结果
@@ -78,6 +79,7 @@
result1.setUserId(null);
result1.setMsg(result.getMsg());
}
+ System.out.println("result1 = " + result1);
Map<String, Object> map1 = new HashMap<>(1);
map1.put(uuid,result1);
//向外网发送数据
@@ -89,7 +91,7 @@
* 用户校验
* @param user
*/
- private static R userCheckOut(User user) {
+ private static Result userCheckOut(User user) {
//1. 校验是否有重复导入
User user1 = new User();
user1.setCardid(user.getCardid());
@@ -98,13 +100,18 @@
User one = hanlder.userService.getOne(Condition.getQueryWrapper(user1));
if (null!=one){
//判断单位是否一致
- if (one.getDeptId().equals(user.getDeptId())){
- R.data(400,null,user.getRealName() + "已在其他单位导入");
+ if (!one.getDeptId().equals(user.getDeptId())){
+ return new Result(400,null,user.getRealName() + "已在其他单位导入");
}else {
- R.data(201,one,"已在本单位导入");
+ return new Result(201,"已在本单位导入",one);
}
}
- return R.data(200,null,"");
+
+ //2.保安证编号校验
+
+
+
+ return new Result(200,null,"");
}
--
Gitblit v1.9.3