@@ -23,29 +23,34 @@ func QryGroups(ctx context.Context, appkey, groupId, name string, offset string,
2323 Items : []* apimodels.Group {},
2424 }
2525 storage := storages .NewGroupStorage ()
26+ memberStorage := storages .NewGroupMemberStorage ()
2627 if groupId != "" {
2728 grp , err := storage .FindById (appkey , groupId )
2829 if err == nil && grp != nil {
29- ret . Items = append ( ret . Items , & apimodels.Group {
30+ apiGrp := & apimodels.Group {
3031 GroupId : grp .GroupId ,
3132 GroupName : grp .GroupName ,
3233 GroupPortrait : grp .GroupPortrait ,
3334 Owner : QryUserInfo (appkey , grp .CreatorId ),
3435 CreatedTime : grp .CreatedTime .UnixMilli (),
35- })
36+ }
37+ apiGrp .MemberCount = memberStorage .CountByGroup (appkey , groupId )
38+ ret .Items = append (ret .Items , apiGrp )
3639 }
3740 } else {
3841 grps , err := storage .QryGroups (appkey , name , startId , limit , isPositive )
3942 if err == nil {
4043 for _ , grp := range grps {
4144 ret .Offset , _ = tools .EncodeInt (grp .ID )
42- ret . Items = append ( ret . Items , & apimodels.Group {
45+ apiGrp := & apimodels.Group {
4346 GroupId : grp .GroupId ,
4447 GroupName : grp .GroupName ,
4548 GroupPortrait : grp .GroupPortrait ,
4649 Owner : QryUserInfo (appkey , grp .CreatorId ),
4750 CreatedTime : grp .CreatedTime .UnixMilli (),
48- })
51+ }
52+ apiGrp .MemberCount = memberStorage .CountByGroup (appkey , grp .GroupId )
53+ ret .Items = append (ret .Items , apiGrp )
4954 }
5055 }
5156 }
0 commit comments