1

gx_api/GxPress/Api/GxPress.Api/AppControllers/DepartmentController.cs

@@ -4,7 +4,7 @@ using GxPress.Request.Department;
 using GxPress.Result.Department;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-
+using GxPress.Service.Interface.Department;
 namespace GxPress.Api.AppControllers
 {
     [Route("api/app/department")]
@@ -13,10 +13,11 @@ namespace GxPress.Api.AppControllers
     public class DepartmentController : ControllerBase
     {
         private readonly IDepartmentRepository _departmentRepository;
-
-        public DepartmentController(IDepartmentRepository departmentRepository)
+        private readonly IDepartmentService departmentService;
+        public DepartmentController(IDepartmentRepository departmentRepository, IDepartmentService departmentService)
         {
             _departmentRepository = departmentRepository;
+            this.departmentService = departmentService;
         }
 
         /// <summary>
@@ -27,7 +28,7 @@ namespace GxPress.Api.AppControllers
         [HttpPost("user-list")]
         public async Task<DepartmentUserResult> GetDepartmentUserResult(DepartmentUserRequest request)
         {
-            return await _departmentRepository.GetDepartmentUserResultAsync(request);
+            return await departmentService.GetDepartmentUserResultAsync(request);
         }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/UserController.cs

@@ -32,7 +32,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-
+using GxPress.Service.Interface.Department;
 namespace GxPress.Api.WebControllers
 {
     /// <summary>
@@ -46,6 +46,7 @@ namespace GxPress.Api.WebControllers
         private readonly JwtOptions _jwtOptions;
         private readonly ILogger<UserController> _logger;
         private readonly IUserRepository _userRepository;
+        private readonly IDepartmentService departmentService;
         private readonly IDepartmentRepository _departmentRepository;
         private readonly ILoginContext _loginContext;
         private readonly IUserService _userService;
@@ -58,7 +59,7 @@ namespace GxPress.Api.WebControllers
         private readonly IFriendsRepository friendsRepository;
         public UserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<UserController> logger, IDepartmentRepository departmentRepository, ILoginContext loginContext,
-            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository, IFeedbackRepository _feedbackRepository, IFriendsRepository friendsRepository)
+            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository, IFeedbackRepository _feedbackRepository, IFriendsRepository friendsRepository, IDepartmentService departmentService)
         {
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
@@ -73,6 +74,7 @@ namespace GxPress.Api.WebControllers
             this._addressBookGroupUserRepository = _addressBookGroupUserRepository;
             this._feedbackRepository = _feedbackRepository;
             this.friendsRepository = friendsRepository;
+            this.departmentService = departmentService;
         }
         /// <summary>
         /// 登录
@@ -443,7 +445,7 @@ namespace GxPress.Api.WebControllers
         [HttpPost("user-list")]
         public async Task<DepartmentUserResult> GetDepartmentUserResult(DepartmentUserRequest request)
         {
-            return await _departmentRepository.GetDepartmentUserResultAsync(request);
+            return await departmentService.GetDepartmentUserResultAsync(request);
         }
         /// <summary>
         /// 添加意见反馈

gx_api/GxPress/Model/GxPress.Entity/Department.cs

@@ -17,19 +17,24 @@ namespace GxPress.Entity
         /// <summary>
         /// 父级部门id
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public int ParentId { get; set; }
 
         /// <summary>
         /// 部门主管id
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public int LeaderId { get; set; }
         /// <summary>
         /// 排序
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public int Sort { get; set; }
+        /// <summary>
+        /// 用户成员
+        /// </summary>
+        /// <value></value>
+        public int UserCount { get; set; }
     }
     /// <summary>
     /// 部门
@@ -45,7 +50,7 @@ namespace GxPress.Entity
         /// <summary>
         /// 用户ID
         /// </summary>
-        [DataColumn] 
+        [DataColumn]
         public int UserId { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Request/App/User/FindUserRequest.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace GxPress.Request.App.User
 {

gx_api/GxPress/Service/GxPress.Service.Implement/Department/DepartmentService.cs

@@ -1,7 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using AutoMapper;
 using GxPress.Repository.Interface;
+using GxPress.Request.Department;
+using GxPress.Result.Department;
 using GxPress.Service.Interface;
 using GxPress.Service.Interface.Department;
+using GxPress.Repository.Interface.DepartmentUser;
+using System.Linq;
 
 namespace GxPress.Service.Implement.Department
 {
@@ -16,15 +22,37 @@ namespace GxPress.Service.Implement.Department
         private readonly IDepartmentRepository _departmentRepository;
         private readonly IUserRepository _userRepository;
         private readonly IUserService _userService;
-
+        private readonly IDepartmentUserRepository departmentUserRepository;
         public DepartmentService(IMapper mapper, IDepartmentRepository departmentRepository,
-            IUserRepository userRepository, IUserService userService)
+            IUserRepository userRepository, IUserService userService, IDepartmentUserRepository departmentUserRepository)
         {
             _departmentRepository = departmentRepository;
             _userRepository = userRepository;
             _userService = userService;
             _mapper = mapper;
+            this.departmentUserRepository = departmentUserRepository;
+        }
+        /// <summary>
+        /// 根据部门ID获取成员以及下级部门
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<DepartmentUserResult> GetDepartmentUserResultAsync(DepartmentUserRequest request)
+        {
+            var result = await _departmentRepository.GetDepartmentUserResultAsync(request);
+            if (result.Departments != null)
+            {
+                foreach (var item in result.Departments)
+                {
+                    //获取部门
+                    var departments = new List<Entity.Department>();
+                    await _departmentRepository.GetDepartmentById(item.Id, departments);
+                    var userIds = await departmentUserRepository.GetUserIdsByDepartmentIdsAsync(departments.Select(n => n.Id));
+                    item.UserCount = userIds.Count();
+                }
+
+            }
+            return result;
         }
-      
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/Department/IDepartmentService.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
+using GxPress.Request.Department;
+using GxPress.Result.Department;
 
 namespace GxPress.Service.Interface.Department
 {
@@ -13,5 +12,11 @@ namespace GxPress.Service.Interface.Department
         /// <param name="id"></param>
         /// <returns></returns>
         Task<bool> DeleteAsync(int id);
+        /// <summary>
+        /// 根据部门ID获取成员以及下级部门
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<DepartmentUserResult> GetDepartmentUserResultAsync(DepartmentUserRequest request);
     }
 }