boweniac пре 3 месеци
родитељ
комит
dc6d49b8f4

+ 2 - 1
internal/logic/Wxhook/get_friends_and_groups_logic.go

@@ -95,10 +95,11 @@ func (l *GetFriendsAndGroupsLogic) GetFriendsAndGroups(req *types.IDReq) (resp *
 					SetDontseeme(cast.ToInt(friend.Dontseeme)).
 					SetLag(friend.Lag).
 					SetV3(friend.V3).
+					SetOrganizationID(organizationId).
 					OnConflict().
 					UpdateNewValues().
-					SetOrganizationID(organizationId).
 					ID(l.ctx)
+				l.Infof("----------------l.svcCtx.DB.Contact.Create err--------------: %+v", err)
 				if err == nil {
 					lags := splitStringToIntArray(friend.Lag)
 					newFriendIds[id] = lags

+ 2 - 0
internal/logic/contact/get_contact_list_logic.go

@@ -75,6 +75,8 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
 	}
 	if req.Type != nil {
 		predicates = append(predicates, contact.TypeEQ(*req.Type))
+	} else {
+		predicates = append(predicates, contact.Or(contact.TypeEQ(1), contact.TypeEQ(2)))
 	}
 	data, err := l.svcCtx.DB.Contact.Query().Where(predicates...).WithContactRelationships(func(query *ent.LabelRelationshipQuery) {
 		query.WithLabels()