【admin】优化# 1.新增客户联系人小程序端时将用户名和昵称区分 2.新增后台用户时将用户名和昵称区分
parent
3bbc1d47a6
commit
4552140069
|
@ -179,7 +179,7 @@ public class ClientContactsServiceImpl implements IClientContactsService {
|
|||
user.setType(UserTypeEnum.USER_SIDE.getType());
|
||||
user.setAvatar(avatar);
|
||||
user.setNickname(clientContactsParam.getName());
|
||||
user.setUsername(clientContactsParam.getName());
|
||||
user.setUsername(clientContactsParam.getUsername());
|
||||
user.setSex(clientContactsParam.getSex());
|
||||
user.setLastLoginTime(System.currentTimeMillis() / 1000);
|
||||
user.setCreateTime(System.currentTimeMillis() / 1000);
|
||||
|
|
|
@ -392,8 +392,10 @@ public class EquipmentServiceImpl implements IEquipmentService {
|
|||
Client client = clientMapper.selectOne(
|
||||
new LambdaQueryWrapper<Client>()
|
||||
.eq(Client::getId, item.getClientId()));
|
||||
vo.setClientName(client.getClientName());
|
||||
vo.setShortName(client.getShortName());
|
||||
if(client != null){
|
||||
vo.setClientName(client.getClientName());
|
||||
vo.setShortName(client.getShortName());
|
||||
}
|
||||
list.add(vo);
|
||||
}
|
||||
|
||||
|
|
|
@ -331,7 +331,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
|
|||
user.setSn(iUserService.randMakeSn());
|
||||
user.setType(UserTypeEnum.USER_SIDE.getType());
|
||||
user.setAvatar(avatar);
|
||||
user.setNickname(systemAuthAdminParam.getUsername());
|
||||
user.setNickname(systemAuthAdminParam.getNickname());
|
||||
user.setUsername(systemAuthAdminParam.getUsername());
|
||||
user.setSex(systemAuthAdminParam.getSex());
|
||||
user.setLastLoginTime(System.currentTimeMillis() / 1000);
|
||||
|
|
Loading…
Reference in New Issue