正在显示
3 个修改的文件
包含
5 行增加
和
2 行删除
| @@ -58,7 +58,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | @@ -58,7 +58,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | ||
| 58 | models, err := gateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{ | 58 | models, err := gateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{ |
| 59 | PageSize: domain.NormalQueryRowCount, | 59 | PageSize: domain.NormalQueryRowCount, |
| 60 | PageNumber: 1, | 60 | PageNumber: 1, |
| 61 | - //CompanyId: cmd.Operator.CompanyId, | 61 | + CompanyId: cmd.Operator.CompanyId, |
| 62 | //OrgId: cmd.Operator.OrgId, | 62 | //OrgId: cmd.Operator.OrgId, |
| 63 | CooperationModeNumbers: modeNumbers, | 63 | CooperationModeNumbers: modeNumbers, |
| 64 | }) | 64 | }) |
| @@ -15,7 +15,7 @@ type UpdateUserInfoCommand struct { | @@ -15,7 +15,7 @@ type UpdateUserInfoCommand struct { | ||
| 15 | // 头像 | 15 | // 头像 |
| 16 | Avatar string `cname:"头像" json:"avatar"` | 16 | Avatar string `cname:"头像" json:"avatar"` |
| 17 | // 用户姓名 | 17 | // 用户姓名 |
| 18 | - UserName string `cname:"用户姓名" json:"userName" valid:"Required"` | 18 | + UserName string `cname:"用户姓名" json:"userName"` |
| 19 | // 邮箱 | 19 | // 邮箱 |
| 20 | Email string `cname:"用户姓名" json:"email"` | 20 | Email string `cname:"用户姓名" json:"email"` |
| 21 | // 邮箱 | 21 | // 邮箱 |
| @@ -132,6 +132,9 @@ func (srv UserService) UpdateUserBaseInfo(updateUserInfoCommand *command.UpdateU | @@ -132,6 +132,9 @@ func (srv UserService) UpdateUserBaseInfo(updateUserInfoCommand *command.UpdateU | ||
| 132 | if _, ok := updateUserInfoCommand.BodyKV["phone"]; !ok { | 132 | if _, ok := updateUserInfoCommand.BodyKV["phone"]; !ok { |
| 133 | updateUserInfoCommand.Phone = user.UserInfo.Phone | 133 | updateUserInfoCommand.Phone = user.UserInfo.Phone |
| 134 | } | 134 | } |
| 135 | + if _, ok := updateUserInfoCommand.BodyKV["userName"]; !ok { | ||
| 136 | + updateUserInfoCommand.UserName = user.UserInfo.UserName | ||
| 137 | + } | ||
| 135 | if _, ok := updateUserInfoCommand.BodyKV["smsCode"]; ok && len(updateUserInfoCommand.SmsCode) > 0 { | 138 | if _, ok := updateUserInfoCommand.BodyKV["smsCode"]; ok && len(updateUserInfoCommand.SmsCode) > 0 { |
| 136 | smsServeGateway := sms_serve.NewHttplibHttplibSmsServe() | 139 | smsServeGateway := sms_serve.NewHttplibHttplibSmsServe() |
| 137 | err := smsServeGateway.CheckSmsCode(updateUserInfoCommand.Phone, updateUserInfoCommand.SmsCode) | 140 | err := smsServeGateway.CheckSmsCode(updateUserInfoCommand.Phone, updateUserInfoCommand.SmsCode) |
-
请 注册 或 登录 后发表评论