From e5a61f4aeecd32610e6e96668af4ef64c41e20f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 16 Oct 2025 02:28:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E5=A2=9E=E5=8A=A0=E6=9C=BA?= =?UTF-8?q?=E6=9E=84ID=E9=9B=86=E5=90=88=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F-=20=E5=9C=A8=20UserVerify=20=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E4=B8=BA=20createTime=20=E5=92=8C=20updateTi?= =?UTF-8?q?me=20=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=20JsonFormat=20?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BB=A5=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20-=20=E5=9C=A8=20UserVerifyMapper.xml=20?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=AF=B9=20organizationIds=20?= =?UTF-8?q?=E7=9A=84=20IN=20=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=20-=20?= =?UTF-8?q?=E5=9C=A8=20UserVerifyParam=20=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=20organizationIds=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=94=A8=E4=BA=8E=E6=8E=A5=E6=94=B6=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=20ID=20=E9=9B=86=E5=90=88=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20-=20=E5=BC=95=E5=85=A5=20TableField=20=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=20organizationIds=E4=B8=BA=E9=9D=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5-=20=E6=B7=BB=E5=8A=A0=20Se?= =?UTF-8?q?t=20=E7=B1=BB=E5=9E=8B=E5=AF=BC=E5=85=A5=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=9C=BA=E6=9E=84=20ID=20=E9=9B=86=E5=90=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/common/system/entity/UserVerify.java | 3 +++ .../common/system/mapper/xml/UserVerifyMapper.xml | 6 ++++++ .../com/gxwebsoft/common/system/param/UserVerifyParam.java | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java index dfe06d4..303fdbe 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java @@ -1,6 +1,7 @@ package com.gxwebsoft.common.system.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -87,9 +88,11 @@ public class UserVerify implements Serializable { private Integer tenantId; @Schema(description = "注册时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; @Schema(description = "手机号码") diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml index 379cce3..395036b 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml @@ -63,6 +63,12 @@ AND a.create_time <= #{param.createTimeEnd} + + AND a.organization_id IN + + #{item} + + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java index bee1aac..d0510cd 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.param; +import com.baomidou.mybatisplus.annotation.TableField; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; @@ -9,6 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Set; + /** * 实名认证查询参数 * @@ -65,6 +68,10 @@ public class UserVerifyParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer organizationId; + @Schema(description = "机构id合集") + @TableField(exist = false) + private Set organizationIds; + @Schema(description = "备注") private String comments;