用户导入覆盖

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -531,6 +531,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                 if(StringUtil.isEmpty(user.getPhone())){
                     throw new ServiceException("手机号不能为空，请填写正确的手机号后，再导入");
                 }
+            }
+            if(StringUtil.isEmpty(user.getAccount())){
                 user.setAccount(user.getPhone());
             }
             // 设置用户平台
@@ -571,7 +573,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             // 覆盖数据
             if (isCovered) {
                 // 查询用户是否存在
-                User oldUser = UserCache.getUser(AuthUtil.getTenantId(), userExcel.getAccount());
+                User oldUser = UserCache.getUser(AuthUtil.getTenantId(), user.getAccount());
                 //User oldUser = baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getAccount, userExcel.getAccount()).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
                 if (oldUser != null && oldUser.getId() != null) {
                     user.setId(oldUser.getId());