1

gx_api/GxPress/Model/GxPress.Request/App/Group/GroupSearchRequest.cs

@@ -20,6 +20,15 @@ namespace GxPress.Request.App.Group
         /// 搜索
         /// </summary>
         public string Key { get; set; }
+        /// <summary>
+        ///是否加入联系人
+        /// </summary>
+        /// <value></value>
         public bool IsContacts { get; set; }
+        /// <summary>
+        /// 是否过滤空文件夹
+        /// </summary>
+        /// <value></value>
+        public bool IsFiltrationBlank { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -172,8 +172,12 @@ namespace GxPress.Repository.Implement
             var data = new List<GroupUserFindResult>();
             data.AddRange(await GetGroupUserFindResult(true, request));
             data.AddRange(await GetGroupUserFindResult(false, request));
-            foreach (var item in data)
-                item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+            for (int i = 0; i < data.Count; i++)
+            {
+                data[i].AvatarUrl = StringUtils.AddDomainMin(data[i].AvatarUrl);
+                if (data[i].FileCount == 0 && request.IsFiltrationBlank && data[i].AttributeValue == AttributeValueConst.File.GetHashCode())
+                    data.Remove(data[i]);
+            }
             result.Items = data;
             result.Total = result.Items.Count();
             return result;

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.cs

@@ -274,7 +274,7 @@ namespace GxPress.Service.Implement.Group
             query.Where(nameof(Entity.GroupUser.UserId), request.UserId);
             query.Where(nameof(Entity.GroupUser.GroupId), request.GroupId);
             var groupUser = await _groupUserRepository.GetAsync(query);
-            result.IsContacts = groupUser.IsContacts;
+            result.IsContacts = groupUser == null ? false : groupUser.IsContacts;
             result.UserName = user.Name;
             result.GroupUserNumber = result.GroupUserListResult.Count();
             //获取小组话题数量