|
|
@@ -6,6 +6,7 @@ import com.zhongshu.card.client.model.school.DictInfoParam;
|
|
|
import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
|
|
|
import com.zhongshu.card.client.utils.type.CertificateType;
|
|
|
import com.zhongshu.card.client.utils.type.OrganizationUserType;
|
|
|
+import com.zhongshu.card.client.utils.type.Sex;
|
|
|
import com.zhongshu.card.client.utils.type.UserState;
|
|
|
import io.swagger.v3.oas.annotations.media.Schema;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
@@ -32,10 +33,30 @@ public class OrganizationUserModel extends SuperModel {
|
|
|
@Schema(description = "用户信息")
|
|
|
private UserCountModel user;
|
|
|
|
|
|
+ @Schema(description = "性别")
|
|
|
+ private Sex sex;
|
|
|
+
|
|
|
+ public Sex getSex() {
|
|
|
+ if (user != null) {
|
|
|
+ return user.getSex();
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Schema(description = "性别显示字段")
|
|
|
+ private String sexStr;
|
|
|
+
|
|
|
+ public String getSexStr() {
|
|
|
+ if (user != null) {
|
|
|
+ return user.getSexStr();
|
|
|
+ }
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
@Schema(description = "用户ID")
|
|
|
private String userId;
|
|
|
|
|
|
- @Schema(description = "工号")
|
|
|
+ @Schema(description = "工号、编码")
|
|
|
private String code;
|
|
|
|
|
|
@Schema(description = "用户手机号")
|
|
|
@@ -100,7 +121,7 @@ public class OrganizationUserModel extends SuperModel {
|
|
|
|
|
|
@Schema(description = "部门信息")
|
|
|
DepartmentModel department;
|
|
|
-
|
|
|
+
|
|
|
@Schema(description = "部门信息所有级")
|
|
|
private List<DepartmentModel> departments = new ArrayList<>();
|
|
|
}
|