|
@@ -55,7 +55,7 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
|
|
organizationId := l.ctx.Value("organizationId").(uint64)
|
|
organizationId := l.ctx.Value("organizationId").(uint64)
|
|
isAdmin := l.ctx.Value("isAdmin").(bool)
|
|
isAdmin := l.ctx.Value("isAdmin").(bool)
|
|
var predicates []predicate.Contact
|
|
var predicates []predicate.Contact
|
|
- if req.WxWxid == nil || (req.WxWxid != nil && *req.WxWxid != "" && !isAdmin) {
|
|
|
|
|
|
+ if req.WxWxid == nil || (req.WxWxid != nil && !isAdmin) {
|
|
predicates = append(predicates, contact.OrganizationIDEQ(organizationId))
|
|
predicates = append(predicates, contact.OrganizationIDEQ(organizationId))
|
|
}
|
|
}
|
|
if req.Status != nil {
|
|
if req.Status != nil {
|
|
@@ -107,19 +107,15 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
|
|
}
|
|
}
|
|
|
|
|
|
if req.WxWxid != nil && *req.WxWxid != "" {
|
|
if req.WxWxid != nil && *req.WxWxid != "" {
|
|
- logx.Info(111222)
|
|
|
|
predicates = append(predicates, contact.WxWxidContains(*req.WxWxid))
|
|
predicates = append(predicates, contact.WxWxidContains(*req.WxWxid))
|
|
}
|
|
}
|
|
if req.Wxid != nil && *req.Wxid != "" {
|
|
if req.Wxid != nil && *req.Wxid != "" {
|
|
- logx.Info(3333)
|
|
|
|
predicates = append(predicates, contact.WxidContains(*req.Wxid))
|
|
predicates = append(predicates, contact.WxidContains(*req.Wxid))
|
|
}
|
|
}
|
|
if req.Account != nil && *req.Account != "" {
|
|
if req.Account != nil && *req.Account != "" {
|
|
- logx.Info(4444444)
|
|
|
|
predicates = append(predicates, contact.AccountContains(*req.Account))
|
|
predicates = append(predicates, contact.AccountContains(*req.Account))
|
|
}
|
|
}
|
|
if req.Nickname != nil && *req.Nickname != "" {
|
|
if req.Nickname != nil && *req.Nickname != "" {
|
|
- logx.Info(5555)
|
|
|
|
predicates = append(predicates, contact.NicknameContains(*req.Nickname))
|
|
predicates = append(predicates, contact.NicknameContains(*req.Nickname))
|
|
}
|
|
}
|
|
if req.Type != nil {
|
|
if req.Type != nil {
|