|
|
@@ -527,6 +527,12 @@ 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("手机号不能为空,请填写正确的手机号后,再导入");
|
|
|
+ }
|
|
|
+ user.setAccount(user.getPhone());
|
|
|
+ }
|
|
|
// 设置用户平台
|
|
|
user.setUserType(String.valueOf(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1)));
|
|
|
|
|
|
@@ -574,8 +580,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());
|