From aacf24db4518ee248b9ebda389312ab7dc4e564e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 28 Jun 2022 20:37:34 +0800
Subject: [PATCH] 保安员同步修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 c94bade..874f79f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -616,9 +616,6 @@
if (null!= user.getPassword()) {
one.setPassword(user.getPassword());
}
- if (null!= user.getAvatar()) {
- one.setAvatar(user.getAvatar());
- }
if (null!= user.getPhone()) {
one.setPhone(user.getPhone());
}
@@ -640,17 +637,14 @@
if (null!= user.getPassword()) {
user2.setPassword(user.getPassword());
}
- if (null!= user.getAvatar()) {
- user2.setAvatar(user.getAvatar());
- }
if (null!= user.getPhone()) {
user2.setPhone(user.getPhone());
}
if (null!= user.getRealName()) {
user2.setRealName(user.getRealName());
}
- if (null!= user.getCardid()) {
- user2.setRealName(user.getCardid());
+ if (null!= user.getSex()) {
+ user2.setSex(user.getSex());
}
user2.setStatus(1);
user2.setIsDeleted(0);
@@ -660,6 +654,7 @@
user2.setTenantId("000000");
user2.setCreateTime(new Date());
user2.setUpdateTime(new Date());
+ user2.setSecurityId(user.getSecurityId());
user2.setId(null);
//新增
status = userService.save(user2);
--
Gitblit v1.9.3