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/service/impl/UserServiceImpl.java |    4 +++-
 src/main/java/org/springblade/modules/system/controller/UserController.java    |   11 +++++++----
 2 files changed, 10 insertions(+), 5 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 795f8d7..93d7917a 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -866,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);
 		}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 62a0ce0..fb45edb 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -443,7 +443,9 @@
 				userDTO.setPassword(user1.getPassword());
 				userDTO.setSecurityId(user1.getId().toString());
 				userDTO.setPhone(user1.getPhone());
-				userDTO.setAvatar(user1.getAvatar());
+				userDTO.setRealName(user1.getRealName());
+				userDTO.setCardid(user1.getCardid());
+				userDTO.setSex(user1.getSex());
 				//异步修改群防群控
 				myAsyncService.updateUserByAccount(userDTO);
 			}

--
Gitblit v1.9.3