|
|
@@ -411,9 +411,9 @@ public class AdminUserServiceImpl implements AdminUserService {
|
|
|
// 校验用户名唯一
|
|
|
validateUsernameUnique(id, username);
|
|
|
// 校验手机号唯一
|
|
|
- validateMobileUnique(id, mobile);
|
|
|
+// validateMobileUnique(id, mobile);
|
|
|
// 校验邮箱唯一
|
|
|
- validateEmailUnique(id, email);
|
|
|
+// validateEmailUnique(id, email);
|
|
|
// 校验部门处于开启状态
|
|
|
deptService.validateDeptListByCodes(CollectionUtils.singleton(deptId));
|
|
|
// 校验岗位处于开启状态
|
|
|
@@ -512,15 +512,22 @@ public class AdminUserServiceImpl implements AdminUserService {
|
|
|
throw exception(USER_IMPORT_LIST_IS_EMPTY);
|
|
|
}
|
|
|
// 1.2 初始化密码不能为空
|
|
|
- String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY).getCheckedData();
|
|
|
- if (StrUtil.isEmpty(initPassword)) {
|
|
|
- throw exception(USER_IMPORT_INIT_PASSWORD);
|
|
|
- }
|
|
|
+// String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY).getCheckedData();
|
|
|
+// if (StrUtil.isEmpty(initPassword)) {
|
|
|
+// throw exception(USER_IMPORT_INIT_PASSWORD);
|
|
|
+// }
|
|
|
|
|
|
// 2. 遍历,逐个创建 or 更新
|
|
|
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
|
|
|
.updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
|
|
|
importUsers.forEach(importUser -> {
|
|
|
+
|
|
|
+ //根据用户名定义密码
|
|
|
+ String initPassword = "BW@";
|
|
|
+ if (importUser.getUsername() != null){
|
|
|
+ initPassword += importUser.getUsername();
|
|
|
+ }
|
|
|
+
|
|
|
// 2.1.1 校验字段是否符合要求
|
|
|
try {
|
|
|
ValidationUtils.validate(BeanUtils.toBean(importUser, UserSaveReqVO.class).setPassword(initPassword));
|