|
@@ -151,7 +151,8 @@ public class UserServiceImpl implements UserService {
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
}
|
|
|
|
|
|
- DmUser dmUser = new DmUser();
|
|
|
+ DmUser dmUser = dmUserRepository.findById(resources.getId()).orElseGet(DmUser::new);
|
|
|
+ //DmUser dmUser = new DmUser();
|
|
|
dmUser.setId(resources.getId());
|
|
|
dmUser.setName(resources.getNickName());
|
|
|
dmUser.setSex(resources.getGender());
|
|
@@ -162,8 +163,6 @@ public class UserServiceImpl implements UserService {
|
|
|
dmUser.setUserCode(resources.getUserCode());
|
|
|
dmUser.setStatus(resources.getEnabled());
|
|
|
dmUser.setType("01");
|
|
|
- DmCardDto dmCardDto = dmCardService.create(new DmCard());
|
|
|
- dmUser.setCardid(String.valueOf(dmCardDto.getId()));
|
|
|
DmUser dmUser1 = dmUserRepository.save(dmUser);
|
|
|
|
|
|
resources.setDmCompany(null);
|