修改bug

liujie

2023-10-31 904cfe3bad14c27857a062849fc92dd85035c524

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
package com.dsh.guns.modular.system.factory;
 
import com.dsh.guns.modular.system.model.User;
import com.dsh.guns.modular.system.transfer.UserDto;
import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils;
 
/**
 * 用户创建工厂
 *
 * @author fengshuonan
 * @date 2017-05-05 22:43
 */
public class UserFactory {
 
    public static User createUser(UserDto userDto) {
        if (userDto == null) {
            return null;
        } else {
            User user = new User();
            BeanUtils.copyProperties(userDto, user);
            return user;
        }
    }
 
    public static User editUser(UserDto newUser, User oldUser) {
        if (newUser == null || oldUser == null) {
            return oldUser;
        } else {
            if (!StringUtils.isEmpty(newUser.getAvatar())) {
                oldUser.setAvatar(newUser.getAvatar());
            }
            if (!StringUtils.isEmpty(newUser.getName())) {
                oldUser.setName(newUser.getName());
            }
            if (!StringUtils.isEmpty(newUser.getBirthday())) {
                oldUser.setBirthday(newUser.getBirthday());
            }
            if (!StringUtils.isEmpty(newUser.getRoleid())) {
                oldUser.setRoleid(newUser.getRoleid());
            }
            if (!StringUtils.isEmpty(newUser.getSex())) {
                oldUser.setSex(newUser.getSex());
            }
            if (!StringUtils.isEmpty(newUser.getEmail())) {
                oldUser.setEmail(newUser.getEmail());
            }
            if (!StringUtils.isEmpty(newUser.getPhone())) {
                oldUser.setPhone(newUser.getPhone());
                oldUser.setAccount(newUser.getPhone());
            }
            if (!StringUtils.isEmpty(newUser.getIdCard())) {
                oldUser.setIdCard(newUser.getIdCard());
            }
            return oldUser;
        }
    }
}