diff --git a/server/ldap-admin/internal/logic/getldapuserinfologic.go b/server/ldap-admin/internal/logic/getldapuserinfologic.go index 39168765..1b1a5b52 100644 --- a/server/ldap-admin/internal/logic/getldapuserinfologic.go +++ b/server/ldap-admin/internal/logic/getldapuserinfologic.go @@ -54,8 +54,10 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, r Email: user.Email, Mobile: user.Mobile, Avatar: user.Avatar, - Status: user.Status, EmployeeTpye: user.EmployeeType, + Gender: user.Gender, + Birthday: user.Birthday, + Status: user.Status, }) } diff --git a/server/ldap-admin/internal/logic/updateldapuserlogic.go b/server/ldap-admin/internal/logic/updateldapuserlogic.go index fd3ece66..aa039832 100644 --- a/server/ldap-admin/internal/logic/updateldapuserlogic.go +++ b/server/ldap-admin/internal/logic/updateldapuserlogic.go @@ -68,6 +68,8 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, r *ht "postalAddress": {req.Avatar}, "postalCode": {fmt.Sprintf("%d", req.Status)}, "employeeType": {fmt.Sprintf("%d", req.EmployeeType)}, + "st": {fmt.Sprintf("%d", req.Gender)}, //性别 + "title": {req.Birthday}, //生日 } err := l.svcCtx.Ldap.Update(req.UserDN, attr) if err != nil { diff --git a/server/ldap-admin/internal/types/types.go b/server/ldap-admin/internal/types/types.go index e5a6c8c3..be736526 100644 --- a/server/ldap-admin/internal/types/types.go +++ b/server/ldap-admin/internal/types/types.go @@ -163,6 +163,8 @@ type UpdateLdapUserReq struct { Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 GroupId int64 `json:"group_id,optional"` //权限分组id + Gender int64 `json:"gender,options=1|2|3"` //性别 1男 2女 3未知 + Birthday string `json:"birthday"` //生日 } type UpdateLdapUserPwdReq struct { @@ -182,12 +184,14 @@ type GetLdapUserInfoReq struct { type GetLdapUserInfoRsp struct { UserId int64 `json:"user_id"` UserDN string `json:"user_dn"` - UserName string `json:"user_name"` //用户名 - Email string `json:"email"` //邮箱 - Mobile string `json:"mobile"` //手机号 - Avatar string `json:"avatar"` //头像地址 - EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包 - Status int64 `json:"status,options=0|1"` //状态 1正常0离职 + UserName string `json:"user_name"` //用户名 + Email string `json:"email"` //邮箱 + Mobile string `json:"mobile"` //手机号 + Avatar string `json:"avatar"` //头像地址 + EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包 + Gender int64 `json:"gender,options=1|2|3"` //性别 1男 2女 3未知 + Birthday string `json:"birthday"` //生日 + Status int64 `json:"status,options=0|1"` //状态 1正常0离职 } type AddLdapOrganizationMemberReq struct { diff --git a/server_api/ldap-admin.api b/server_api/ldap-admin.api index 48f9601c..69df272b 100644 --- a/server_api/ldap-admin.api +++ b/server_api/ldap-admin.api @@ -247,6 +247,8 @@ type UpdateLdapUserReq { Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 GroupId int64 `json:"group_id,optional"` //权限分组id + Gender int64 `json:"gender,options=1|2|3"` //性别 1男 2女 3未知 + Birthday string `json:"birthday"` //生日 } //修改用户密码 type UpdateLdapUserPwdReq { @@ -265,12 +267,14 @@ type GetLdapUserInfoReq { type GetLdapUserInfoRsp { UserId int64 `json:"user_id"` UserDN string `json:"user_dn"` - UserName string `json:"user_name"` //用户名 - Email string `json:"email"` //邮箱 - Mobile string `json:"mobile"` //手机号 - Avatar string `json:"avatar"` //头像地址 - EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包 - Status int64 `json:"status,options=0|1"` //状态 1正常0离职 + UserName string `json:"user_name"` //用户名 + Email string `json:"email"` //邮箱 + Mobile string `json:"mobile"` //手机号 + Avatar string `json:"avatar"` //头像地址 + EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包 + Gender int64 `json:"gender,options=1|2|3"` //性别 1男 2女 3未知 + Birthday string `json:"birthday"` //生日 + Status int64 `json:"status,options=0|1"` //状态 1正常0离职 } //ldap组织添加成员 type AddLdapOrganizationMemberReq {