From 24fe2651724cfe704064a4676d99fd6cfcbfe411 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 23 Sep 2025 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:1.=E5=BE=AE=E4=BF=A1=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=90=8E=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=EF=BC=9B2.=E6=8C=89=E7=B1=BB=E5=88=AB=E6=9F=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/model/dto/EmailSendDTO.java  |  2 ++
 .../java/com/ai/da/model/dto/ProjectQueryDTO.java    |  2 +-
 .../com/ai/da/service/impl/AccountServiceImpl.java   | 12 +++++++-----
 .../ai/da/service/impl/UserLikeGroupServiceImpl.java |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

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<String> 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<AccountMapper, Account> impl
                     Account account = accounts.get(0);
                     QueryWrapper<AccountExtend> accountExtendQW = new QueryWrapper<>();
                     accountExtendQW.lambda().eq(AccountExtend::getAccountId, account.getId());
-                    accountExtendQW.lambda().eq(AccountExtend::getAuth, "WeChat");
+                    accountExtendQW.lambda().eq(AccountExtend::getAuthType, "WeChat");
                     List<AccountExtend> 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<UserLikeGroupMapper, U
             queryWrapper.le("update_time", new Date(query.getEndDate()));
         }
         if (!StringUtils.isEmpty(query.getProcess())) {
-            queryWrapper.eq("process", query.getProcess());
+            queryWrapper.in("process", query.getProcess());
         }
         // 新增分类过滤
         if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {