From 32106f511657695e79d53e98a350ce70a36f6da1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:07:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
index 8eeac90..314d70d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/factory/UserFactory.java
@@ -36,8 +36,8 @@
if (!StringUtils.isEmpty(newUser.getBirthday())) {
oldUser.setBirthday(newUser.getBirthday());
}
- if (!StringUtils.isEmpty(newUser.getDeptid())) {
- oldUser.setDeptid(newUser.getDeptid());
+ if (!StringUtils.isEmpty(newUser.getRoleid())) {
+ oldUser.setRoleid(newUser.getRoleid());
}
if (!StringUtils.isEmpty(newUser.getSex())) {
oldUser.setSex(newUser.getSex());
@@ -47,6 +47,10 @@
}
if (!StringUtils.isEmpty(newUser.getPhone())) {
oldUser.setPhone(newUser.getPhone());
+ oldUser.setAccount(newUser.getPhone());
+ }
+ if (!StringUtils.isEmpty(newUser.getIdCard())) {
+ oldUser.setIdCard(newUser.getIdCard());
}
return oldUser;
}
--
Gitblit v1.7.1