From e290026f1004fca0d8cf43bf986a3dbd8b7974c9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 28 Jun 2022 20:23:33 +0800
Subject: [PATCH] 保安员信息同步修改

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 30ce8a9..93d7917a 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -583,8 +583,10 @@
 				boolean status = userService.updateById(user);
 				//qfqk 数据推送
 				if (status) {
+					User user2 = new User();
+					user2.setId(user.getId());
 					//删除
-					myAsyncService.deleteUserByQfqk(user);
+					myAsyncService.deleteUserByQfqk(user2);
 					//内网更新
 					String s1 =
 						"update blade_user set status = " + "'" + user.getStatus() + "'"
@@ -864,12 +866,15 @@
 //		status = userService.updateById(user);
 		if (status){
 			System.out.println("user = " + user);
+			User user2 = userService.getById(user.getId());
 			UserDTO userDTO = new UserDTO();
 			userDTO.setAccount(user.getAccount());
-			userDTO.setPassword(user.getPassword());
-			userDTO.setSecurityId(user.getId().toString());
-			userDTO.setPhone(user.getPhone());
-			userDTO.setAvatar(user.getAvatar());
+			userDTO.setPassword(user2.getPassword());
+			userDTO.setSecurityId(user2.getId().toString());
+			userDTO.setRealName(user1.getRealName());
+			userDTO.setPhone(user2.getPhone());
+			userDTO.setCardid(user2.getCardid());
+			userDTO.setSex(user1.getSex());
 			//异步修改群防群控
 			myAsyncService.updateUserByAccount(userDTO);
 		}
@@ -1082,7 +1087,7 @@
 			User user = userService.getById(id);
 			User user1 = new User();
 			user1.setId(user.getId());
-			user1.setCardid(user.getCardid());
+//			user1.setCardid(user.getCardid());
 			user1.setIsDeleted(1);
 			//qfqk 同步
 			myAsyncService.deleteUserByQfqk(user1);

--
Gitblit v1.9.3