1

gx_api/GxPress/Api/GxPress.Api/AppControllers/UserController.cs

@@ -450,5 +450,15 @@ namespace GxPress.Api.AppControllers
         {
             return await _userService.GetUserInfoByDepartentResult(departentId);
         }
+        /// <summary>
+        /// 获取群聊和小组的用户
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("group-chat")]
+        public async Task<IEnumerable<UserInfoResult>> GetGroupOrGroupChatUserInfosResult(UserInfoByGroupoRoGroupChatResult request)
+        {
+            return await _userService.GetGroupOrGroupChatUserInfosResult(request.TypeValue, request.Id, request.Keyword);
+        }
     }
 }

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

@@ -112,5 +112,26 @@ namespace GxPress.Result.User
         /// <value></value>
         public int TypeValue { get; set; }
     }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UserInfoByGroupoRoGroupChatResult
+    {
+        /// <summary>
+        /// 1 群聊 2小组
+        /// </summary>
+        /// <value></value>
+        public int TypeValue { get; set; }
+        /// <summary>
+        /// 群聊小组ID
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <value></value>
+        public string Keyword { get; set; }
+    }
 
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -1025,5 +1025,7 @@ namespace GxPress.Repository.Implement
                 item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
             return result;
         }
+
+       
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Notice/NoticeService.cs

@@ -399,6 +399,8 @@ namespace GxPress.Service.Implement.Notice
                     await _noticeRepository.UpdateAsync(Q.Where(nameof(Entity.Notice.Id), id).Set(nameof(Entity.Notice.IsRecall), true));
                     //删除middle
                     await _middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), false).Set(nameof(Entity.Middle.Middle.IsRecall), true));
+                    //删除收件人和抄送人
+                    await _addresseeRepository.DeleteAsync(id, AllTypeConst.Notice.GetHashCode(), 0);
                     //修改为草稿箱
                     await _middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), true).Set(nameof(Entity.Middle.Middle.NoticeAddresseeType), 2));
                     //修改

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

@@ -43,9 +43,11 @@ namespace GxPress.Service.Implement
         private readonly IWaitHandleRepository waitHandleRepository;
         private readonly IDepartmentUserRepository departmentUserRepository;
         private readonly IFriendsRepository friendsRepository;
+        private readonly IGroupChatUserRepository groupChatUserRepository;
+        private readonly IGroupUserRepository groupUserRepository;
         public UserService(IUserRepository userRepository, IDepartmentRepository departmentRepository,
             IAddressBookGroupRepository addressBookGroupRepository, IBlacklistUserRepository blacklistUserRepository,
-            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository, IDepartmentUserRepository departmentUserRepository, IFriendsRepository friendsRepository)
+            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository, IDepartmentUserRepository departmentUserRepository, IFriendsRepository friendsRepository, IGroupChatUserRepository groupChatUserRepository, IGroupUserRepository groupUserRepository)
         {
 
             _userRepository = userRepository;
@@ -61,6 +63,8 @@ namespace GxPress.Service.Implement
             this.waitHandleRepository = waitHandleRepository;
             this.departmentUserRepository = departmentUserRepository;
             this.friendsRepository = friendsRepository;
+            this.groupChatUserRepository = groupChatUserRepository;
+            this.groupUserRepository = groupUserRepository;
         }
 
         /// <summary>
@@ -530,5 +534,31 @@ namespace GxPress.Service.Implement
             var userIds = await departmentUserRepository.GetUserIdsAsync(departent.Select(n => n.Id));
             return await _userRepository.GetUserInfoResultsAsync(userIds);
         }
+        /// <summary>
+        /// 获取群聊和小组的用户
+        /// </summary>
+        /// <param name="typeValue"></param>
+        /// <param name="id"></param>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserInfoResult>> GetGroupOrGroupChatUserInfosResult(int typeValue, int id, string keyword)
+        {
+            //群聊
+            if (typeValue == 1)
+            {
+                var groupChatUsers = await groupChatUserRepository.GetAllAsync(Q.Where(nameof(Entity.GroupChatUser.GroupChatId), id));
+                var result = await _userRepository.GetSearchUserInfoResults(keyword, groupChatUsers.Select(n => n.UserId));
+                return result;
+            }
+            //小组
+            if (typeValue == 2)
+            {
+                var groupUsers = await groupUserRepository.GetAllAsync(Q.Where(nameof(Entity.GroupUser.GroupId), id));
+                var result = await _userRepository.GetSearchUserInfoResults(keyword, groupUsers.Select(n => n.UserId));
+                return result;
+            }
+            return null;
+        }
+
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/IUserService.cs

@@ -83,5 +83,13 @@ namespace GxPress.Service.Interface
         /// <param name="departentId"></param>
         /// <returns></returns>
         Task<IEnumerable<UserInfoResult>> GetUserInfoByDepartentResult(int departentId);
+         /// <summary>
+        /// 获取群聊和小组的用户
+        /// </summary>
+        /// <param name="typeValue"></param>
+        /// <param name="id"></param>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+         Task<IEnumerable<UserInfoResult>> GetGroupOrGroupChatUserInfosResult(int typeValue, int id, string keyword);
     }
 }