From 43d1d26787f08fd8723fafe4ecb62ded0e75b609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 13 Jan 2026 16:11:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(operation-record):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=BA=E6=9E=84ID=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在OperationRecordParam中新增organizationIds字段用于机构ID集合查询 - 修改OperationRecordMapper.xml添加机构ID条件判断和IN查询逻辑 - 支持多机构ID的批量筛选操作记录 - 完善参数校验和查询条件构建机制 --- .../common/system/mapper/xml/OperationRecordMapper.xml | 6 ++++++ .../gxwebsoft/common/system/param/OperationRecordParam.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml index e03147b..0214d8a 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml @@ -16,6 +16,12 @@ AND a.user_id = #{param.userId} + + AND b.organization_id IN + + #{item} + + AND a.module LIKE CONCAT('%', #{param.module}, '%') diff --git a/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java b/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java index 26b6478..48e77fd 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/OperationRecordParam.java @@ -10,6 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Set; + /** * 操作日志参数 * @@ -31,6 +33,10 @@ public class OperationRecordParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer userId; + @Schema(description = "机构id合集") + @TableField(exist = false) + private Set organizationIds; + @Schema(description = "操作模块") private String module;