员工修改bug修复
This commit is contained in:
parent
df69bfcb40
commit
152e2261e8
|
|
@ -2,6 +2,7 @@ package com.czg.account.dto.staff;
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
@ -29,14 +30,17 @@ public class ShopStaffEditDTO {
|
||||||
/**
|
/**
|
||||||
* 登录账号
|
* 登录账号
|
||||||
*/
|
*/
|
||||||
|
@Size(min = 1, message = "登录账号不为空")
|
||||||
private String accountName;
|
private String accountName;
|
||||||
/**
|
/**
|
||||||
* 登录密码
|
* 登录密码
|
||||||
*/
|
*/
|
||||||
|
@Size(min = 1, message = "登录密码不为空")
|
||||||
private String accountPwd;
|
private String accountPwd;
|
||||||
/**
|
/**
|
||||||
* 手机号
|
* 手机号
|
||||||
*/
|
*/
|
||||||
|
@Size(min = 1, message = "手机号不为空")
|
||||||
private String phone;
|
private String phone;
|
||||||
/**
|
/**
|
||||||
* 员工编号
|
* 员工编号
|
||||||
|
|
|
||||||
|
|
@ -77,12 +77,13 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
|
||||||
sysUser.setPhone(shopStaffEditDTO.getPhone());
|
sysUser.setPhone(shopStaffEditDTO.getPhone());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
|
String accountName = StpKit.USER.getLoginIdAsString() + "@" + shopStaffEditDTO.getAccountName();
|
||||||
long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()).ne(SysUser::getId, sysUser.getId()));
|
if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !accountName.equals(sysUser.getAccount())) {
|
||||||
|
long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, accountName).ne(SysUser::getId, sysUser.getId()));
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
throw new ApiNotPrintException("此账户名已存在");
|
throw new ApiNotPrintException("此账户名已存在");
|
||||||
}
|
}
|
||||||
sysUser.setAccount(StpKit.USER.getLoginIdAsString() + "@" + shopStaffEditDTO.getAccountName());
|
sysUser.setAccount(accountName);
|
||||||
}
|
}
|
||||||
sysUserService.updateById(sysUser);
|
sysUserService.updateById(sysUser);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue