用户导入覆盖

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

@@ -527,6 +527,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     public void importUser(List<UserExcel> data, Boolean isCovered) {
         data.forEach(userExcel -> {
             User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
+            if(StringUtil.isEmpty(user.getAccount())){
+                if(StringUtil.isEmpty(user.getPhone())){
+                    throw new ServiceException("手机号不能为空，请填写正确的手机号后，再导入");
+                }
+            }
+            if(StringUtil.isEmpty(user.getAccount())){
+                user.setAccount(user.getPhone());
+            }
             // 设置用户平台
             user.setUserType(String.valueOf(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1)));
 
@@ -565,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());
@@ -574,8 +582,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                 }
             }
             // 获取默认密码配置
-            user.setPassword("123456"); //此处不加密，submit里面加密了
-            user.setPlaintextPassword("123456");
+            user.setPassword("user123456"); //此处不加密，submit里面加密了
+            user.setPlaintextPassword("user123456");
             user.setStatus(1);
             user.setIsDeleted(0);
             user.setCode(user.getAccount());