renfan
/
charging_pile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【admin】优化# 1.新增客户联系人小程序端时将用户名和昵称区分 2.新增后台用户时将用户名和昵称区分

dev
dabin 2024-09-04 15:43:28 +08:00
parent 3bbc1d47a6
commit 4552140069
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java
View File

@ -179,7 +179,7 @@ public class ClientContactsServiceImpl implements IClientContactsService {
user.setType(UserTypeEnum.USER_SIDE.getType()); user.setType(UserTypeEnum.USER_SIDE.getType());
user.setAvatar(avatar); user.setAvatar(avatar);
user.setNickname(clientContactsParam.getName()); user.setNickname(clientContactsParam.getName());
user.setUsername(clientContactsParam.getName()); user.setUsername(clientContactsParam.getUsername());
user.setSex(clientContactsParam.getSex()); user.setSex(clientContactsParam.getSex());
user.setLastLoginTime(System.currentTimeMillis() / 1000); user.setLastLoginTime(System.currentTimeMillis() / 1000);
user.setCreateTime(System.currentTimeMillis() / 1000); user.setCreateTime(System.currentTimeMillis() / 1000);

6
admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java
View File

@ -392,8 +392,10 @@ public class EquipmentServiceImpl implements IEquipmentService {
Client client = clientMapper.selectOne( Client client = clientMapper.selectOne(
new LambdaQueryWrapper<Client>() new LambdaQueryWrapper<Client>()
.eq(Client::getId, item.getClientId())); .eq(Client::getId, item.getClientId()));
vo.setClientName(client.getClientName()); if(client != null){
vo.setShortName(client.getShortName()); vo.setClientName(client.getClientName());
vo.setShortName(client.getShortName());
}
list.add(vo); list.add(vo);
} }

2
admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java
View File

@ -331,7 +331,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService {
user.setSn(iUserService.randMakeSn()); user.setSn(iUserService.randMakeSn());
user.setType(UserTypeEnum.USER_SIDE.getType()); user.setType(UserTypeEnum.USER_SIDE.getType());
user.setAvatar(avatar); user.setAvatar(avatar);
user.setNickname(systemAuthAdminParam.getUsername()); user.setNickname(systemAuthAdminParam.getNickname());
user.setUsername(systemAuthAdminParam.getUsername()); user.setUsername(systemAuthAdminParam.getUsername());
user.setSex(systemAuthAdminParam.getSex()); user.setSex(systemAuthAdminParam.getSex());
user.setLastLoginTime(System.currentTimeMillis() / 1000); user.setLastLoginTime(System.currentTimeMillis() / 1000);