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;