1

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupChatController.cs

@@ -191,7 +191,7 @@ namespace GxPress.Api.AppControllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("list")]
-        public async Task<IEnumerable<GroupChat>> GetGroupChatsAsync()
+        public async Task<IEnumerable<GroupChatInfoResult>> GetGroupChatsAsync()
         {
             return await _groupChatRepository.GetGroupChatsAsync(_loginContext.AccountId);
         }

gx_api/GxPress/Model/GxPress.EnumConst/AllTypeConst.cs

@@ -106,4 +106,22 @@ namespace GxPress.EnumConst
         [Description("推荐")]
         Recommend = -3,
     }
+    /// <summary>
+    /// 用户通讯录
+    /// /// </summary>
+    public enum UserlinkConst
+    {
+        [Description("单位通讯录")]
+        Work = 1,
+        [Description("系统通讯录")]
+        System = 2,
+        [Description("我的小组")]
+        MyGroup = 20,
+        [Description("我的群聊")]
+        MyGroupChat = 21,
+        [Description("自建通讯录")]
+        My = 3,
+        [Description("其他")]
+        Other = 4
+    }
 }

gx_api/GxPress/Model/GxPress.Result/App/Group/GroupDetailResult.cs

@@ -28,6 +28,16 @@ namespace GxPress.Result.App.Group
         /// </summary>
         /// <value></value>
         public int UserCount { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int TypeValue { get; set; }
     }
     /// <summary>
     /// 小组详情

gx_api/GxPress/Model/GxPress.Result/App/GroupChat/GroupChatInfoResult.cs

@@ -69,5 +69,15 @@ namespace GxPress.Result.App.GroupChat
         /// </summary>
 
         public bool IsOpenQrCoder { get; set; }
+
+        /// <summary>
+        /// 人数
+        /// </summary>
+        /// <value></value>
+        public int UserCount { get; set; }
+
+        public int TypeValue { get; set; }
+        public int TypeId { get; set; }
+
     }
 }

gx_api/GxPress/Model/GxPress.Result/User/UserInfoResult.cs

@@ -8,6 +8,7 @@ namespace GxPress.Result.User
     /// </summary>
     public class UserInfoResult
     {
+        public int TypeValue { get; set; }
         /// <summary>
         /// 
         /// </summary>

gx_api/GxPress/Model/GxPress.Result/User/UserResult.cs

@@ -125,6 +125,11 @@ namespace GxPress.Result.User
         /// </summary>
         /// <value></value>
         public int UserCount { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        /// <value></value>
+        public int TypeId { get; set; }
     }
     /// <summary>
     /// 

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatRepository.cs

@@ -437,7 +437,7 @@ namespace GxPress.Repository.Implement
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<GroupChat>> GetGroupChatsAsync(int userId)
+        public async Task<IEnumerable<GroupChatInfoResult>> GetGroupChatsAsync(int userId)
         {
             string sql = $@"SELECT 
                                     *,(select count(1) from tede_group_chat_user where GroupChatId=a.Id) as UserCount
@@ -454,11 +454,13 @@ namespace GxPress.Repository.Implement
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
-            var result = await connection.QueryAsync<GroupChat>(sql);
+            var result = await connection.QueryAsync<GroupChatInfoResult>(sql);
             foreach (var item in result)
             {
                 item.QRCoder = StringUtils.AddDomain(item.QRCoder);
                 item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
+                item.TypeValue = UserlinkConst.MyGroupChat.GetHashCode();
+                item.TypeId = UserlinkConst.System.GetHashCode();
             }
             return result;
         }

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

@@ -514,35 +514,40 @@ namespace GxPress.Repository.Implement
         {
             string sql = $@"
                         SELECT 
-                            a.Id,
-                            a.Name,
-                            a.AvatarUrl,
-                            (SELECT 
-                                    COUNT(1)
-                                FROM
-                                    tede_group_user
-                                WHERE
-                                    GroupId = a.Id) AS UserCount
-                        FROM
-                            tede_group a
-                                INNER JOIN
-                            tede_middle b ON a.Id = b.MiddleId
-                        WHERE
-                            b.UserId = userId
-                                AND a.Id IN (SELECT 
-                                    GroupId
-                                FROM
-                                    tede_topic
-                                WHERE
-                                    GroupId > 0 AND UserId = {userId}
-                                ORDER BY CreatedDate DESC)";
+                                a.Id,
+                                a.Name,
+                                a.AvatarUrl,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_group_user
+                                    WHERE
+                                        GroupId = a.Id) AS UserCount
+                            FROM
+                                tede_group a
+                                    INNER JOIN
+                                tede_middle b ON a.Id = b.MiddleId
+                            WHERE
+                                b.UserId = {userId} AND b.FolderType = {AllTypeConst.Group.GetHashCode()}
+                                    AND b.IsDelete = 0
+                                    AND a.Id IN (SELECT 
+                                        GroupId
+                                    FROM
+                                        tede_topic
+                                    WHERE
+                                        GroupId > 0 AND UserId = {userId}
+                                    ORDER BY CreatedDate DESC)";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
             var items = await connection
                 .QueryAsync<LatelyGroupDetailResult>(sql);
             foreach (var item in items)
+            {
                 item.AvatarUrl = StringUtils.AddDomain(item.AvatarUrl);
+                item.TypeValue = UserlinkConst.MyGroup.GetHashCode();
+                item.TypeId = UserlinkConst.System.GetHashCode();
+            }
             return items;
         }
     }

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupChatRepository.cs

@@ -13,20 +13,20 @@ namespace GxPress.Repository.Interface
     /// <summary>
     /// 
     /// </summary>
-   public interface IGroupChatRepository:IRepository
-   {
-       /// <summary>
-       /// 添加
-       /// </summary>
-       /// <param name="request"></param>
-       /// <returns></returns>
-       Task<bool> InsertAsync(GroupChatInRequest request);
+    public interface IGroupChatRepository : IRepository
+    {
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> InsertAsync(GroupChatInRequest request);
         /// <summary>
         /// 修改
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-       Task<bool> UpdateAsync(GroupChatUpRequest request);
+        Task<bool> UpdateAsync(GroupChatUpRequest request);
         /// <summary>
         /// 删除
         /// </summary>
@@ -74,17 +74,17 @@ namespace GxPress.Repository.Interface
         Task<bool> SetIsOpenQrCoderAsync(string groupChatImId, int userId);
 
         Task<GroupChat> GetAsync(SqlKata.Query query);
-         /// <summary>
+        /// <summary>
         /// 根据ImId获取群信息
         /// </summary>
         /// <param name="imId"></param>
         /// <returns></returns>
-         Task<GroupChatInfoResult> GetGroupChatInfoByImIdAsync(string imId);
-          /// <summary>
+        Task<GroupChatInfoResult> GetGroupChatInfoByImIdAsync(string imId);
+        /// <summary>
         /// 获取用户加入的群
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
-         Task<IEnumerable<GroupChat>> GetGroupChatsAsync(int userId);
-   }
+        Task<IEnumerable<GroupChatInfoResult>> GetGroupChatsAsync(int userId);
+    }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/UserService.cs

@@ -24,6 +24,7 @@ using GxPress.Repository.Interface.WaitHandle;
 using GxPress.Request.AddressBookGroup;
 using GxPress.Repository.Interface.DepartmentUser;
 using GxPress.Repository.Interface.Friends;
+using GxPress.EnumConst;
 
 namespace GxPress.Service.Implement
 {
@@ -389,14 +390,17 @@ namespace GxPress.Service.Implement
                         {
                             Id = department.Id,
                             Name = department.Name,
-                            UserCount = userInfoResults.Count()
+                            UserCount = userInfoResults.Count(),
+                            TypeId = UserlinkConst.Work.GetHashCode(),
+                            TypeValue = 0,
                         });
                     }
                 }
+                //单位通讯录
                 userLinkResult.Add(new UserLinkModelResult
                 {
-                    TypeId = 1,
-                    Name = "单位通讯录",
+                    TypeId = UserlinkConst.Work.GetHashCode(),
+                    Name = UserlinkConst.Work.GetDescriptionOriginal(),
                     Items = userLinkModelAttributeResult
                 });
             }
@@ -405,18 +409,23 @@ namespace GxPress.Service.Implement
             userLinkResult.Add(
               new UserLinkModelResult
               {
-                  TypeId = 2,
-                  Name = "系统通讯录",
+                  TypeId = UserlinkConst.System.GetHashCode(),
+                  Name = UserlinkConst.System.GetDescriptionOriginal(),
                   Items = new List<UserLinkModelAttributeResult>{
-                        new UserLinkModelAttributeResult{Id=0,Name="我的小组"
-                        ,TypeValue=1
-                        ,UserCount=await groupUserRepository.GetUserIntoGroupUserCountAsync(userId)
+                        new UserLinkModelAttributeResult{
+                        Id=0,
+                        Name=UserlinkConst.MyGroup.GetDescriptionOriginal(),
+                        TypeValue=UserlinkConst.MyGroup.GetHashCode(),
+                        TypeId= UserlinkConst.System.GetHashCode(),
+                        UserCount=await groupUserRepository.GetUserIntoGroupUserCountAsync(userId)
                         },
-                        new UserLinkModelAttributeResult{Id=0
-                        ,Name="我的群聊"
-                        ,TypeValue=2
-                        ,UserCount=await groupChatUserRepository.GetUserIntoGroupChatUserCountAsync(userId)},
-                        //new UserLinkModelAttributeResult{Id=0,Name="我的课程",TypeValue=3}
+                        new UserLinkModelAttributeResult{
+                        Id=0,
+                        Name=UserlinkConst.MyGroupChat.GetDescriptionOriginal(),
+                        TypeId= UserlinkConst.System.GetHashCode(),
+                        TypeValue=UserlinkConst.MyGroupChat.GetHashCode(),
+                        UserCount=await groupChatUserRepository.GetUserIntoGroupChatUserCountAsync(userId)
+                        }
                   }
               }
           );
@@ -429,22 +438,25 @@ namespace GxPress.Service.Implement
                 {
                     Id = item.Id,
                     Name = item.GroupName,
+                    TypeId = UserlinkConst.My.GetHashCode(),
                     UserCount = item.UserCount
                 });
             if (addressBookGroupList.Count() > 0)
+                //自建通讯录
                 userLinkResult.Add(
                     new UserLinkModelResult
                     {
-                        TypeId = 3,
-                        Name = "自建通讯录",
+                        TypeId = UserlinkConst.My.GetHashCode(),
+                        Name = UserlinkConst.My.GetDescriptionOriginal(),
                         Items = systemLinkModelAttributeResults
                     }
                 );
             userLinkResult.Add(
+               //其他
                new UserLinkModelResult
                {
-                   TypeId = 4,
-                   Name = "其他",
+                   TypeId = UserlinkConst.Other.GetHashCode(),
+                   Name = UserlinkConst.Other.GetDescriptionOriginal(),
                    Items = new List<UserLinkModelAttributeResult>()
                }
            );
@@ -469,7 +481,12 @@ namespace GxPress.Service.Implement
         public async Task<IEnumerable<UserInfoResult>> GetLatelyChatUsersAsync(int userId)
         {
             var userIds = await oftenContactRepository.GetAllAsync(userId);
-            return await _userRepository.GetUserInfoResultsAsync(userIds);
+            var item = await _userRepository.GetUserInfoResultsAsync(userIds);
+            foreach (var userInfo in item)
+            {
+                userInfo.TypeId = 0; userInfo.TypeValue = 0;
+            }
+            return item;
         }
         /// <summary>
         /// 获取好友列表