11.27,9

44323

2024-03-08 db3e6f6d5a8f29a5dc576aba2eab76a8133ce03c

 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;
        }