diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java index 8e130d36..32d18d8a 100644 --- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java +++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java @@ -9,6 +9,8 @@ import javax.validation.constraints.NotBlank; @Data @ApiModel("邮箱发送") public class EmailSendDTO { + @ApiModelProperty("用户id") + private Long userId; @NotBlank(message = "email.cannot.be.empty") @ApiModelProperty("邮箱") diff --git a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java index 65f28a86..05153fd2 100644 --- a/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java @@ -37,7 +37,7 @@ public class ProjectQueryDTO extends PageQueryBaseVo { @ApiModelProperty("1交集2并集") private Integer intersection; - private String process; + private List process; private Integer asc; } diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 8b987ba9..c9b4d716 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -520,19 +520,21 @@ public class AccountServiceImpl extends ServiceImpl impl Account account = accounts.get(0); QueryWrapper accountExtendQW = new QueryWrapper<>(); accountExtendQW.lambda().eq(AccountExtend::getAccountId, account.getId()); - accountExtendQW.lambda().eq(AccountExtend::getAuth, "WeChat"); + accountExtendQW.lambda().eq(AccountExtend::getAuthType, "WeChat"); List accountExtends = accountExtendMapper.selectList(accountExtendQW); if (CollectionUtil.isNotEmpty(accountExtends)) { throw new BusinessException("This email account has already been linked to another WeChat account."); + } else { + throw new BusinessException("This email address is already in use. Please try a different email address."); } } result = SendEmailUtil.send(emailSendDTO.getEmail(), null, SendEmailUtil.BIND_MAILBOX_TEMPLATE_ID, randomVerifyCode); - if (!StringUtil.isNullOrEmpty(emailSendDTO.getCountry()) || !StringUtil.isNullOrEmpty(emailSendDTO.getOccupation()) - || StringUtils.isEmpty(emailSendDTO.getSurname()) || StringUtils.isNotEmpty(emailSendDTO.getTitle())){ - Long accountId = UserContext.getUserHolder().getId(); - Account account = baseMapper.selectById(accountId); + if (Objects.nonNull(emailSendDTO.getUserId()) && + (!StringUtil.isNullOrEmpty(emailSendDTO.getCountry()) || !StringUtil.isNullOrEmpty(emailSendDTO.getOccupation()) + || StringUtils.isEmpty(emailSendDTO.getSurname()) || StringUtils.isNotEmpty(emailSendDTO.getTitle()))){ + Account account = baseMapper.selectById(emailSendDTO.getUserId()); account.setCountry(emailSendDTO.getCountry()); account.setOccupation(emailSendDTO.getOccupation()); account.setTitle(emailSendDTO.getTitle()); diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 29a02a7f..0d58594f 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1727,7 +1727,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl