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<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);
         }
 
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);