1

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

@@ -96,6 +96,16 @@ namespace GxPress.Api.AppControllers
         }
 
         /// <summary>
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupChatId"></param>
+        /// <returns></returns>
+        [HttpPut("contacts/{groupChatId}")]
+        public async Task<bool> UpdateContactsAsync(int groupChatId)
+        {
+            return await _groupChatRepository.UpdateContactsAsync(groupChatId, _loginContext.AccountId);
+        }
+        /// <summary>
         /// 创建群
         /// </summary>
         /// <param name="request"></param>
@@ -171,7 +181,7 @@ namespace GxPress.Api.AppControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("guid")]
-        public async Task<GroupChat> GetGroupChatByGuid(GroupChatByGuidRequest request)
+        public async Task<GroupChatInfoResult> GetGroupChatByGuid(GroupChatByGuidRequest request)
         {
             return await _groupChatRepository.GetGroupChatByGuidAsync(request.GroupChatGuid);
         }

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupChatUserController.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
+using Datory;
 using GxPress.Auth;
 using GxPress.Common.Exceptions;
 using GxPress.Common.Tools;
@@ -79,10 +80,15 @@ namespace GxPress.Api.AppControllers
                 GroupChat = groupChat,
                 Item = await _groupChatUserRepository.GetGroupChatUserByGroupChatIdAsync(request)
             };
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.GroupChatUser.UserId), _loginContext.AccountId);
+            query.Where(nameof(Entity.GroupChatUser.GroupChatId), groupChat.Id);
+            var groupChatUser = await _groupChatUserRepository.GetAsync(query);
+            result.GroupChat.IsContacts = groupChatUser.IsContacts;
             //判断是否是管理员
             result.GroupChat.IsAdmin = result.GroupChat.UserId == _loginContext.AccountId;
             //result.GroupChat.AvatarUrl = StringUtils.AddDomainMin(result.GroupChat.AvatarUrl);
-             //result.GroupChat.QRCoder = StringUtils.AddDomain(result.GroupChat.QRCoder);
+            //result.GroupChat.QRCoder = StringUtils.AddDomain(result.GroupChat.QRCoder);
             result.IsAdmin = result.GroupChat.UserId == _loginContext.AccountId;
             result.IsUser = result.Item.Any(n => n.UserId == userId);
             result.IsTop = await _oftenContactRepository.GetIsTopAsync(userId, groupChat.GroupChatImId);

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupController.cs

@@ -42,9 +42,9 @@ namespace GxPress.Api.AppControllers
         private readonly IGroupCategoryService groupCategoryService;
         public GroupController(ILogger<GroupController> logger, IGroupRepository groupRepository,
             IGroupFolderRepository groupFolderRepository, IGroupUserRepository groupUserRepository,
-            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, 
+            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository,
             ITopicService topicService, IGroupCategoryRepository groupCategoryRepository,
-            IUserGroupCategoryRepository userGroupCategoryRepository,IGroupCategoryService groupCategoryService)
+            IUserGroupCategoryRepository userGroupCategoryRepository, IGroupCategoryService groupCategoryService)
         {
             _logger = logger;
             _groupFolderRepository = groupFolderRepository;
@@ -55,8 +55,8 @@ namespace GxPress.Api.AppControllers
             _topicRepository = topicRepository;
             _topicService = topicService;
             this.groupCategoryRepository = groupCategoryRepository;
-            this.userGroupCategoryRepository=userGroupCategoryRepository;
-            this.groupCategoryService=groupCategoryService;
+            this.userGroupCategoryRepository = userGroupCategoryRepository;
+            this.groupCategoryService = groupCategoryService;
         }
 
         /// <summary>
@@ -151,7 +151,16 @@ namespace GxPress.Api.AppControllers
         {
             return await _groupRepository.UpdateAsync(request);
         }
-
+        /// <summary>
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        [HttpPut("contacts/{groupId}")]
+        public async Task<bool> UpdateContactsAsync(int groupId)
+        {
+            return await _groupRepository.UpdateContactsAsync(groupId, _loginContext.AccountId);
+        }
         /// <summary>
         ///设置权限
         /// 1 超级管理员 2 管理员 3普通用户
@@ -250,7 +259,7 @@ namespace GxPress.Api.AppControllers
         [AllowAnonymous]
         public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId)
         {
-             return await groupCategoryService.GetGroupCategoryAsync(parentId, _loginContext.AccountId);
+            return await groupCategoryService.GetGroupCategoryAsync(parentId, _loginContext.AccountId);
         }
         /// <summary>
         /// 或者最近使用的小组

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebGroupChatController.cs

@@ -171,7 +171,7 @@ namespace GxPress.Api.AppControllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("guid")]
-        public async Task<GroupChat> GetGroupChatByGuid(GroupChatByGuidRequest request)
+        public async Task<GroupChatInfoResult> GetGroupChatByGuid(GroupChatByGuidRequest request)
         {
             return await _groupChatRepository.GetGroupChatByGuidAsync(request.GroupChatGuid);
         }

gx_api/GxPress/Model/GxPress.Entity/GroupChatUser.cs

@@ -37,6 +37,11 @@ namespace GxPress.Entity
         /// 群ImId
         /// </summary>
         [DataColumn] public string GroupChatImId { get; set; }
-
+        /// <summary>
+        /// 是否加入到通讯录
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsContacts { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/GroupUser.cs

@@ -39,5 +39,11 @@ namespace GxPress.Entity
         /// <value></value>
         [DataColumn]
         public DateTime ReadDate { get; set; }
+        /// <summary>
+        /// 是否加入到通讯录
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public bool IsContacts { get; set; }
     }
 }

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

@@ -77,6 +77,11 @@ namespace GxPress.Request.App.Group
         /// </summary>
         /// <value></value>
         public bool IsShow { get; set; }
+        /// <summary>
+        /// 是否加入通讯录
+        /// </summary>
+        /// <value></value>
+        public bool IsContacts { get; set; }
     }
     /// <summary>
     /// 小组转移
@@ -87,7 +92,7 @@ namespace GxPress.Request.App.Group
         /// 小组ID
         /// </summary>
         /// <value></value>
-        public int GroupId{get;set;}
+        public int GroupId { get; set; }
         /// <summary>
         /// 小组创建者
         /// </summary>

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

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using GxPress.Common.Page;
 
 namespace GxPress.Request.App.Group
@@ -8,7 +5,7 @@ namespace GxPress.Request.App.Group
     /// <summary>
     /// 查询小组
     /// </summary>
-    public class GroupSearchRequest:PageParameter
+    public class GroupSearchRequest : PageParameter
     {
         /// <summary>
         /// 小组文件夹
@@ -23,5 +20,6 @@ namespace GxPress.Request.App.Group
         /// 搜索
         /// </summary>
         public string Key { get; set; }
+        public bool IsContacts { get; set; }
     }
 }

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

@@ -193,6 +193,11 @@ namespace GxPress.Result.App.Group
         /// </summary>
         /// <value></value>
         public bool IsCreator { get; set; }
+        /// <summary>
+        /// 是否加入通讯录
+        /// </summary>
+        /// <value></value>
+        public bool IsContacts{get;set;}
     }
     /// <summary>
     /// 用户小组列表

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

@@ -78,6 +78,11 @@ namespace GxPress.Result.App.GroupChat
 
         public int TypeValue { get; set; }
         public int TypeId { get; set; }
+        /// <summary>
+        /// 是否加入通讯录
+        /// </summary>
+        /// <value></value>
+        public bool IsContacts { get; set; }
 
     }
 }

gx_api/GxPress/Model/GxPress.Result/GroupChatUser/GroupChatUserByGroupChatIdResult.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using GxPress.Entity;
+using GxPress.Result.App.GroupChat;
 
 namespace GxPress.Result.GroupChatUser
 {
@@ -13,7 +14,7 @@ namespace GxPress.Result.GroupChatUser
         /// <summary>
         /// 群信息
         /// </summary>
-        public GroupChat GroupChat { get; set; }
+        public GroupChatInfoResult GroupChat { get; set; }
         /// <summary>
         /// 结果集
         /// </summary>

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

@@ -339,6 +339,23 @@ namespace GxPress.Repository.Implement
             return groupChats;
         }
         /// <summary>
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateContactsAsync(int groupChatId, int userId)
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.GroupChatUser.UserId), userId);
+            query.Where(nameof(Entity.GroupChatUser.GroupChatId), groupChatId);
+            var groupChatUser = await _groupChatUserRepository.GetAsync(query);
+            if (groupChatUser == null)
+                throw new BusinessException("该用户不存在");
+            groupChatUser.IsContacts = !groupChatUser.IsContacts;
+            return await _groupChatUserRepository.UpdateAsync(groupChatUser);
+        }
+        /// <summary>
         /// 修改是否管理员同意 
         /// </summary>
         /// <param name="request"></param>
@@ -377,9 +394,11 @@ namespace GxPress.Repository.Implement
         {
             return await _repository.GetAsync(query);
         }
-        public async Task<GroupChat> GetGroupChatByImIdAsync(string imId)
+        public async Task<GroupChatInfoResult> GetGroupChatByImIdAsync(string imId)
         {
-            var groupChat = await _repository.GetAsync(Q.Where(nameof(GroupChat.GroupChatImId), imId));
+            var groupChat = await _repository.GetAsync<GroupChatInfoResult>(Q.Where(nameof(GroupChat.GroupChatImId), imId));
+            if (groupChat == null)
+                throw new BusinessException("群聊不存在");
             groupChat.AvatarUrl = Common.Tools.StringUtils.AddDomainMin(groupChat.AvatarUrl);
             groupChat.QRCoder = Common.Tools.StringUtils.AddDomain(groupChat.QRCoder);
             return groupChat;
@@ -411,9 +430,9 @@ namespace GxPress.Repository.Implement
         /// </summary>
         /// <param name="guid"></param>
         /// <returns></returns>
-        public async Task<GroupChat> GetGroupChatByGuidAsync(string guid)
+        public async Task<GroupChatInfoResult> GetGroupChatByGuidAsync(string guid)
         {
-            return await _repository.GetAsync(Q.Where(nameof(GroupChat.Guid), guid));
+            return await _repository.GetAsync<GroupChatInfoResult>(Q.Where(nameof(GroupChat.Guid), guid));
         }
 
         /// <summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatUserRepository.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using GxPress.Common.AppOptions;
@@ -12,7 +11,6 @@ using GxPress.Request.GroupChatUser;
 using GxPress.Result.GroupChatUser;
 using Microsoft.Extensions.Options;
 using Datory;
-using GroupChatUser = GxPress.Entity.GroupChatUser;
 using Dapper;
 
 namespace GxPress.Repository.Implement
@@ -197,6 +195,11 @@ namespace GxPress.Repository.Implement
             return await _repository.GetAsync(id);
         }
 
+
+        public async Task<GroupChatUser> GetAsync(SqlKata.Query query)
+        {
+            return await _repository.GetAsync(query);
+        }
         /// <summary>
         /// 根据群IMID获取用户
         /// </summary>

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

@@ -121,7 +121,24 @@ namespace GxPress.Repository.Implement
             return await _repository.UpdateAsync(group);
         }
         /// <summary>
-        /// 修改小组
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateContactsAsync(int groupId, int userId)
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.GroupUser.GroupId), groupId);
+            query.Where(nameof(Entity.GroupUser.UserId), userId);
+            var groupUser = await _groupUserRepository.GetAsync(query);
+            if (groupUser == null)
+                throw new BusinessException("小组用户不存在");
+            groupUser.IsContacts = !groupUser.IsContacts;
+            return await _groupUserRepository.UpdateAsync(groupUser);
+        }
+        /// <summary>
+        /// /// 修改小组
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -166,6 +183,12 @@ namespace GxPress.Repository.Implement
             var groupConst = AllTypeConst.Group.GetHashCode();
             var query = new SqlKata.Query("tede_Middle");
             query.LeftJoin("tede_group", "tede_group.Id", "tede_Middle.MiddleId");
+            if (request.IsContacts)
+            {
+                query.LeftJoin("tede_group_user", "tede_group_user.GroupId", "tede_group.Id");
+                query.Where("tede_group_user.IsContacts", request.IsContacts);
+                query.Where("tede_group_user.UserId", request.UserId);
+            }
             if (request.GroupFolderId > 0)
                 query.Where("tede_Middle.ParentId", request.GroupFolderId);
             if (!string.IsNullOrEmpty(request.Key))

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupUserRepository.cs

@@ -84,7 +84,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<int> InsertAsync(int userId, int groupId, GroupUserRoleTyeConst groupUserRoleId)
         {
-            GroupUser groupUser = new GroupUser { GroupId = groupId, UserId = userId, GroupUserRoleId = groupUserRoleId, IsUDisturb = false, ReadDate = DateTime.Now };
+            var groupUser = new GroupUser { GroupId = groupId, UserId = userId, GroupUserRoleId = groupUserRoleId, IsUDisturb = false, ReadDate = DateTime.Now };
             return await _repository.InsertAsync(groupUser);
         }
 

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -383,11 +383,11 @@ namespace GxPress.Repository.Implement.Note
                     FROM tede_middle a  LEFT JOIN tede_note b ON a.MiddleId = b.Id 
                     left join tede_user c on c.Id=b.UserId 
                     left join tede_department d on d.Id=c.DepartmentId 
-                    WHERE a.UserId = {request.UserId} AND a.IsDelete = 0 ";
+                    WHERE  a.FolderType = {noteTypeId} and a.UserId = {request.UserId} AND a.IsDelete = 0 ";
                 if (request.TypeValue == 0)
-                    sql += "and (a.RoleId=2 or a.AttributeValue<>2)";
+                    sql += " AND (a.RoleId = 2 OR a.AttributeValue in( 1,2))";
                 else
-                    sql += "and  (a.RoleId in(1,3) or a.AttributeValue<>2)";
+                    sql += "and  (a.RoleId in(1,3) or a.AttributeValue in( 1,2))";
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@" AND (b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
@@ -422,7 +422,7 @@ namespace GxPress.Repository.Implement.Note
                     FROM tede_middle a  LEFT JOIN tede_note b ON a.MiddleId = b.Id 
                     left join tede_user c on c.Id=b.UserId 
                     left join tede_department d on d.Id=c.DepartmentId 
-                    WHERE
+                    WHERE a.FolderType = {noteTypeId} and
                      a.userId = {request.VisitUserId}
                         AND a.IsDelete = 0
                         AND (a.UserId IN (SELECT 
@@ -460,12 +460,12 @@ namespace GxPress.Repository.Implement.Note
             {
                 sql =
                     $@"SELECT  count(1) FROM tede_middle a LEFT JOIN tede_note b ON a.MiddleId = b.Id left join tede_user c on c.Id=b.UserId left join tede_department d 
-                    on d.Id=c.DepartmentId WHERE a.UserId = {request.UserId} AND a.IsDelete = 0";
+                    on d.Id=c.DepartmentId WHERE a.FolderType = {noteTypeId} and a.UserId = {request.UserId} AND a.IsDelete = 0";
                 if (request.TypeValue == 0)
-                    sql += " and  (a.RoleId in(2) or a.AttributeValue<>2)";
+                    sql += " and  (a.RoleId in(2) or a.AttributeValue in(1,2))";
                 else
                 {
-                    sql += " and  (a.RoleId in(1,3) or a.AttributeValue<>2)";
+                    sql += " and  (a.RoleId in(1,3) or a.AttributeValue in(1,2))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND (b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";

gx_api/GxPress/Repository/GxPress.Repository.Implement/TopicRepository.cs

@@ -208,7 +208,7 @@ namespace GxPress.Repository.Implement
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<PagedList<TopicListPageResult>> GetGroupTopicPageAsync(SqlKata.Query query, SqlKata.Query countQuery,TopicDetailListRequest request)
+        public async Task<PagedList<TopicListPageResult>> GetGroupTopicPageAsync(SqlKata.Query query, SqlKata.Query countQuery, TopicDetailListRequest request)
         {
             var result = new PagedList<TopicListPageResult>();
             result.Items = await _repository.GetAllAsync<TopicListPageResult>(query);

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

@@ -56,14 +56,14 @@ namespace GxPress.Repository.Interface
 
         Task<GroupChat> GetAsync(int id);
 
-        Task<GroupChat> GetGroupChatByImIdAsync(string imId);
+        Task<GroupChatInfoResult> GetGroupChatByImIdAsync(string imId);
 
         Task<bool> InsertUsersIntoGroupChatAsync(InsertGroupChatUsersRequest request);
         Task<bool> DeleteUsersIntoGroupChatAsync(InsertGroupChatUsersRequest request);
 
         Task<IEnumerable<GroupChat>> GetAllGroupChatAsync();
 
-        Task<GroupChat> GetGroupChatByGuidAsync(string guid);
+        Task<GroupChatInfoResult> GetGroupChatByGuidAsync(string guid);
 
         /// <summary>
         /// set群是否开启
@@ -86,5 +86,12 @@ namespace GxPress.Repository.Interface
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<IEnumerable<GroupChatInfoResult>> GetGroupChatsAsync(int userId);
+        /// <summary>
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<bool> UpdateContactsAsync(int groupChatId, int userId);
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupChatUserRepository.cs

@@ -10,7 +10,7 @@ using Datory;
 
 namespace GxPress.Repository.Interface
 {
-   public interface IGroupChatUserRepository:IRepository
+    public interface IGroupChatUserRepository : IRepository
     {
         /// <summary>
         /// 添加
@@ -62,7 +62,7 @@ namespace GxPress.Repository.Interface
         Task<bool> IsDisturbAsync(GroupChatUserIsDisturbRequest request);
 
         Task<IEnumerable<GroupChatUser>> GetAllAsync(SqlKata.Query query);
-           /// <summary>
+        /// <summary>
         /// 添加多个
         /// </summary>
         /// <param name="groupChatUsers"></param>
@@ -74,6 +74,7 @@ namespace GxPress.Repository.Interface
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
-       Task<int> GetUserIntoGroupChatUserCountAsync(int userId);
+        Task<int> GetUserIntoGroupChatUserCountAsync(int userId);
+        Task<GroupChatUser> GetAsync(SqlKata.Query query);
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupRepository.cs

@@ -118,5 +118,12 @@ namespace GxPress.Repository.Interface
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<IEnumerable<SearchGroupDetailResult>> GetSearchGroupAsync(string keyWord, int userId);
+        /// <summary>
+        /// 是否添加到通讯录
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<bool> UpdateContactsAsync(int groupId, int userId);
     }
 }

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

@@ -73,7 +73,14 @@ namespace GxPress.Service.Implement.Group
                 using (TransactionScope transactionScope = new TransactionScope())
                 {
                     var groupId = await _groupRepository.InsertAsync(request);
-                    await _groupUserRepository.InsertAsync(request.UserId, groupId, GroupUserRoleTyeConst.SuperAdmin);
+                    var groupUser = new Entity.GroupUser()
+                    {
+                        UserId = request.UserId,
+                        GroupId = groupId,
+                        GroupUserRoleId = GroupUserRoleTyeConst.SuperAdmin,
+                        IsContacts = request.IsContacts
+                    };
+                    await _groupUserRepository.InsertAsync(groupUser);
                     //插入用户
                     //await AddUsersAsync(new GroupUserInRequest { GroupId = groupId, UserIds = request.UserIds });
                     //新建中间件
@@ -263,6 +270,11 @@ namespace GxPress.Service.Implement.Group
                 if (groupCategory != null)
                     result.CategroyName = groupCategory.PiazzaName;
             }
+            var query = Q.NewQuery();
+            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.UserName = user.Name;
             result.GroupUserNumber = result.GroupUserListResult.Count();
             //获取小组话题数量