From ab60d6eb8b4a23a55ad202a56ef91cda9fd6fb37 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期六, 23 七月 2022 14:31:56 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java index a847501..d4ffefc 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java @@ -9,6 +9,8 @@ import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; @@ -61,6 +63,7 @@ @ApiModelProperty("社区id") @Min(value = 1, groups = {PutGroup.class}, message = "社区id不能为空") @NotNull(groups = {PutGroup.class}, message = "社区id不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long communityId; @ApiModelProperty("社区名字") @@ -184,16 +187,56 @@ @ApiModelProperty("是否社区工作人员 1.是 2.否") private Integer isCommunityWorker; + @ApiModelProperty("是否社工 1.是 2.否") + private Integer isSocialWorker; + @ApiModelProperty("实名认证地址") private String address; @ApiModelProperty("是否物业工作人员 1.是 2.否") private Integer isPropertyWorker; + @ApiModelProperty("是否微团队成员 1.是 2.否") + private Integer isFmsMember; + @ApiModelProperty("是否网格员 1.是 2.否") + private Integer isEasyPhotoMember; + @ApiModelProperty("是否社会组织联系人 1.是 2.否") + private Integer isOrgContactPeople; + + @ApiModelProperty("是否人大代表成员 1.是 2.否") + private Integer isDpcMember; @ApiModelProperty("appid") private String appId; @ApiModelProperty("appSecret") private String appSecret; @ApiModelProperty("areaCode") private String areaCode; + @ApiModelProperty("街道id") + private Long streetId; + + @ApiModelProperty("账号类型 1街道 2社区 3社会组织") + private Integer userType; + + @ApiModelProperty("社会组织Id") + private Long orgId; + + @ApiModelProperty("是否是防疫工作人员 1.是 2.否") + private Integer isAcidMember; + + @ApiModelProperty("绑定单位") + private String relationName; + + @ApiModelProperty("区域划分") + private String areaName; + + @ApiModelProperty("是否单位管理员 1是 0否") + private Integer isCheckUnitAdmin; + + @ApiModelProperty("报道单位id") + private Long checkUnitId; + + + public String retrieveRelationName() { + return this.type == 3 ? relationName : name; + } } -- Gitblit v1.7.1