diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index c665e3b..527391a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -119,13 +119,10 @@ public class UserExportModel extends BaseBean { @ApiModelProperty(value ="家庭地址") private String infoFamilyAddress; - @ApiModelProperty(value ="账号状态(枚举:1正常,2冻结使用,3账号异常,4离职,5服务到期)" , example ="-1") + @ApiModelProperty(value ="账号状态" , example ="-1") @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; - @ApiModelProperty(value ="用户状态" , example ="-1") - private Integer infoStatus; - public UserExportModel() { } @@ -140,6 +137,7 @@ public class UserExportModel extends BaseBean { this.userPhone = sysUser.getUserPhone(); this.userEmail = sysUser.getUserEmail(); this.infoEmpNo = sysUser.getUserEmpNo(); + this.userStatus = sysUser.getUserStatus(); } else { this.userLoginName = "用户账号不存在"; } @@ -172,6 +170,11 @@ public class UserExportModel extends BaseBean { this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); this.infoHobby = sysUserInfo.getUserHobby(); this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + this.organizeCode=sysUserInfo.getOrganizeCode(); + this.createDatetime=sysUserInfo.getCreateDatetime(); + this.createUser=sysUserInfo.getCreateUser(); + this.modifyDatetime=sysUserInfo.getModifyDatetime(); + this.modifyUser=sysUserInfo.getModifyUser(); } else { this.infoName = "用户消息不存在"; }