|
@@ -165,15 +165,18 @@ public class SysUserController extends BaseController
|
|
|
@PostMapping("/appAdd")
|
|
|
public ApiResult<Void> appAdd(@Validated @RequestBody SysUser user)
|
|
|
{
|
|
|
- if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),user.getTenantId())))
|
|
|
+ if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),0)))
|
|
|
{
|
|
|
return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
|
}
|
|
|
- if(UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique1(user.getPhonenumber(),user.getTenantId()))){
|
|
|
+ if(UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique1(user.getPhonenumber(),0))){
|
|
|
return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增手机号'" + user.getPhonenumber() + "'失败,手机号已存在");
|
|
|
}
|
|
|
+ if(UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique1(user.getEmail(),0))){
|
|
|
+ return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增邮箱'" + user.getEmail() + "'失败,邮箱已存在");
|
|
|
+ }
|
|
|
List<SysDept> list = deptService.deptListByTenant(user.getTenantId());
|
|
|
- if (list.size() > 0){
|
|
|
+ if (!list.isEmpty()){
|
|
|
user.setDeptId(list.get(0).getDeptId());
|
|
|
}
|
|
|
user.setUserType("00");
|
|
@@ -182,14 +185,6 @@ public class SysUserController extends BaseController
|
|
|
user.setTenantId(user.getTenantId());
|
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
int row = userService.insertUser(user);
|
|
|
-
|
|
|
- // 新增用户岗位关联数据
|
|
|
- SysUserTenant sysUserTenant = new SysUserTenant();
|
|
|
- sysUserTenant.setUserId(user.getUserId());
|
|
|
- sysUserTenant.setIsDefault(true);
|
|
|
- sysUserTenant.setTenantId(user.getTenantId());
|
|
|
- sysUserTenantMapper.insert(sysUserTenant);
|
|
|
-
|
|
|
return toAjax(row);
|
|
|
}
|
|
|
|