feat: add short IM user numbers
This commit is contained in:
@@ -69,16 +69,17 @@ func (s *sSysImUser) Create(ctx context.Context, in *sysin.ImUserCreateInp) (res
|
||||
"password": in.Password,
|
||||
}
|
||||
var wire struct {
|
||||
UserId int64 `json:"user_id"`
|
||||
Username string `json:"username"`
|
||||
Nickname string `json:"nickname"`
|
||||
Phone string `json:"phone"`
|
||||
DisplayNo int `json:"display_no"`
|
||||
UserId int64 `json:"user_id"`
|
||||
Username string `json:"username"`
|
||||
Nickname string `json:"nickname"`
|
||||
Phone string `json:"phone"`
|
||||
}
|
||||
path := "/internal/admin-query/tenants/" + url.PathEscape(tenant.Code) + "/users"
|
||||
if err = imadmin.DefaultClient(ctx).InternalPost(ctx, path, payload, &wire); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res = &sysin.ImUserCreateModel{UserId: wire.UserId, Username: wire.Username, Nickname: wire.Nickname, Phone: wire.Phone}
|
||||
res = &sysin.ImUserCreateModel{DisplayNo: wire.DisplayNo, UserId: wire.UserId, Username: wire.Username, Nickname: wire.Nickname, Phone: wire.Phone}
|
||||
if in.GroupId > 0 {
|
||||
if err = service.SysImUserPolicyGroup().MemberAdd(ctx, &sysin.ImUserPolicyGroupMemberAddInp{GroupId: in.GroupId, UserId: res.UserId}); err != nil {
|
||||
return nil, gerror.Wrap(err, "用户已创建,但加入用户分组失败")
|
||||
@@ -123,6 +124,7 @@ func (s *sSysImUser) Import(ctx context.Context, in *sysin.ImUserImportInp) (res
|
||||
res.FailedCount++
|
||||
} else {
|
||||
item.Success = true
|
||||
item.DisplayNo = created.DisplayNo
|
||||
item.UserId = created.UserId
|
||||
item.Username = created.Username
|
||||
res.SuccessCount++
|
||||
@@ -205,7 +207,7 @@ func (s *sSysImUser) List(ctx context.Context, in *sysin.ImUserListInp) (list []
|
||||
values.Set("user_ids", strings.Join(userIds, ","))
|
||||
}
|
||||
if in.UserId != "" {
|
||||
values.Set("user_id", in.UserId)
|
||||
values.Set("account_no", in.UserId)
|
||||
}
|
||||
if in.Nickname != "" {
|
||||
values.Set("nickname", in.Nickname)
|
||||
@@ -239,17 +241,6 @@ func (s *sSysImUser) List(ctx context.Context, in *sysin.ImUserListInp) (list []
|
||||
if err = fillImUserRegisterTypes(ctx, tenant.Id, list); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
page := in.Page
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
perPage := in.PerPage
|
||||
if perPage < 1 {
|
||||
perPage = 10
|
||||
}
|
||||
for index, item := range list {
|
||||
item.DisplayNo = 1000 + (page-1)*perPage + index
|
||||
}
|
||||
return list, totalCount, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user