From 45521400696d2b953399fb00d1f9d94e2a767cf0 Mon Sep 17 00:00:00 2001 From: dabin <2827029098@qq.com> Date: Wed, 4 Sep 2024 15:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BC=98=E5=8C=96#=201.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E6=97=B6=E5=B0=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E5=92=8C=E6=98=B5=E7=A7=B0=E5=8C=BA=E5=88=86?= =?UTF-8?q?=20=202.=E6=96=B0=E5=A2=9E=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/client/impl/ClientContactsServiceImpl.java | 2 +- .../hcy/admin/service/client/impl/EquipmentServiceImpl.java | 6 ++++-- .../service/system/impl/SystemAuthAdminServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java index 3823d9b..085149f 100644 --- a/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/client/impl/ClientContactsServiceImpl.java @@ -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); diff --git a/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java index e79723b..26e2dfe 100644 --- a/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/client/impl/EquipmentServiceImpl.java @@ -392,8 +392,10 @@ public class EquipmentServiceImpl implements IEquipmentService { Client client = clientMapper.selectOne( new LambdaQueryWrapper() .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); } diff --git a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java index af562ae..2ee3964 100644 --- a/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -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);