From 79d52fc8656743b88df473f5fe102e1ec431bb7b Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 28 Jul 2025 11:47:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(mp):=20=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7ID?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 MpMessagePageReqVO 中添加 userId 字段，用于筛选公众号粉丝UserId
- 在 MpMessageMapper 中添加对 userId 的查询条件
-优化代码结构，调整导入顺序和位置
---
 .../vo/message/MpMessagePageReqVO.java        | 19 +++++++++++++------
 .../mp/dal/mysql/message/MpMessageMapper.java |  6 ++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java b/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java
index d9f7cc876..794869a10 100644
--- a/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java
+++ b/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java
@@ -1,16 +1,18 @@
 package cn.iocoder.yudao.module.mp.controller.admin.message.vo.message;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 公众号消息分页 Request VO")
 @Data
@@ -18,6 +20,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class MpMessagePageReqVO extends PageParam {
 
+    @Serial
+    private static final long serialVersionUID = 7612750541824743033L;
     @Schema(description = "公众号账号的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "公众号账号的编号不能为空")
     private Long accountId;
@@ -28,6 +32,9 @@ public class MpMessagePageReqVO extends PageParam {
     @Schema(description = "公众号粉丝标识", example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
     private String openid;
 
+    @Schema(description = "公众号粉丝UserId", example = "1")
+    private String userId;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @Schema(description = "创建时间")
     private LocalDateTime[] createTime;
diff --git a/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/message/MpMessageMapper.java b/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/message/MpMessageMapper.java
index 72ba56627..93d633b1c 100644
--- a/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/message/MpMessageMapper.java
+++ b/yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/message/MpMessageMapper.java
@@ -1,20 +1,22 @@
 package cn.iocoder.yudao.module.mp.dal.mysql.message;
 
+import org.apache.ibatis.annotations.Mapper;
+
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
 import cn.iocoder.yudao.module.mp.dal.dataobject.message.MpMessageDO;
-import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MpMessageMapper extends BaseMapperX<MpMessageDO> {
 
     default PageResult<MpMessageDO> selectPage(MpMessagePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MpMessageDO>()
+        return this.selectPage(reqVO, new LambdaQueryWrapperX<MpMessageDO>()
                 .eqIfPresent(MpMessageDO::getAccountId, reqVO.getAccountId())
                 .eqIfPresent(MpMessageDO::getType, reqVO.getType())
                 .eqIfPresent(MpMessageDO::getOpenid, reqVO.getOpenid())
+            .eqIfPresent(MpMessageDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(MpMessageDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(MpMessageDO::getId));
     }