1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminDepartmentController.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Threading.Tasks;
 using GxPress.Entity;
 using GxPress.Repository.Interface;
+using GxPress.Repository.Interface.DepartmentUser;
 using GxPress.Result.Department;
 using GxPress.Service.Interface.Department;
 using Microsoft.AspNetCore.Authorization;

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminUserController.cs

@@ -10,6 +10,7 @@ using GxPress.Common.Exceptions;
 using GxPress.Common.Page;
 using GxPress.Entity;
 using GxPress.Repository.Interface;
+using GxPress.Repository.Interface.DepartmentUser;
 using GxPress.Request.User;
 using GxPress.Result.User;
 using GxPress.Service.Interface;
@@ -33,7 +34,7 @@ namespace GxPress.Api.AdminControllers
         private readonly IUserRepository _userRepository;
         private readonly IDepartmentRepository _departmentRepository;
         private readonly IUserService _userService;
-
+     
         public AdminUserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<AdminUserController> logger, IDepartmentRepository departmentRepository, IUserService userService)
         {
@@ -113,7 +114,7 @@ namespace GxPress.Api.AdminControllers
             {
                 throw new Exception("保存失败，字符数不能超出500");
             }
-            return await _userRepository.UpdateAsync(id, request);
+            return await _userService.UpdateAsync(id, request);
         }
 
         /// <summary>

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

@@ -31,4 +31,21 @@ namespace GxPress.Entity
         [DataColumn] 
         public int Sort { get; set; }
     }
+    /// <summary>
+    /// 部门
+    /// </summary>
+    [DataTable("tede_department_user")]
+    public class DepartmentUser : Datory.Entity
+    {
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        [DataColumn]
+        public int DepartmentId { get; set; }
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        [DataColumn] 
+        public int UserId { get; set; }
+    }
 }

gx_api/GxPress/Model/GxPress.Request/Department/DepartmentUserRequest.cs

@@ -2,35 +2,31 @@ using System.Collections.Generic;
 
 namespace GxPress.Request.Department
 {
-    /// <summary>
-    /// 部门人员
-    /// </summary>
     public class DepartmentUserRequest
     {
-        /// <summary>
-        /// 部门ID
-        /// </summary>
         public int DepartmentId { get; set; }
-        /// <summary>
-        /// 来源部门ID
-        /// </summary>
+
         public int SourceDepartmentId { get; set; }
+
+        public bool IsShow { get; set; }
+
+        public IEnumerable<int> UserIds { get; set; }
+    }
+    /// <summary>
+    /// 添加部门用户
+    /// </summary>
+    public class DepartmentUserInRequest
+    {
         /// <summary>
-        /// 排除的用户ID
+        /// 用户ID
         /// </summary>
         /// <value></value>
         public List<int> UserIds { get; set; }
         /// <summary>
-        /// 
-        /// </summary>
-        public DepartmentUserRequest()
-        {
-            UserIds = new List<int>();
-        }
-        /// <summary>
-        /// 是否显示
+        /// 部门ID
         /// </summary>
         /// <value></value>
-        public bool IsShow { get; set; }
+        public int DepartmentId { get; set; }
+
     }
-}
+}

gx_api/GxPress/Model/GxPress.Request/User/UserRequest.cs

@@ -52,7 +52,7 @@ namespace GxPress.Request.User
         /// 部门id
         /// </summary>
 
-        public int DepartmentId { get; set; }
+        public IEnumerable<int> DepartmentId { get; set; }
 
         /// <summary>
         /// 职位

gx_api/GxPress/Repository/GxPress.Repository.Implement/DepartmentUser/DepartmentUserRepository.cs

@@ -0,0 +1,108 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AutoMapper;
+using Datory;
+using GxPress.Common.AppOptions;
+using GxPress.Common.Tools;
+using GxPress.Repository.Interface.DepartmentUser;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+using System.Transactions;
+using GxPress.Request.Department;
+
+namespace GxPress.Repository.Implement.DepartmentUser
+{
+    public class DepartmentUserRepository : IDepartmentUserRepository
+    {
+        private readonly Repository<Entity.DepartmentUser> _repository;
+        private readonly IMapper _mapper;
+        private readonly IDistributedCache _cache;
+        private readonly string _connectionString;
+        private readonly string _databaseTypeStr;
+
+        public DepartmentUserRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
+        {
+            _databaseTypeStr = dbOptionsAccessor.CurrentValue.DatabaseType;
+            _connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
+            var databaseType = StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
+            var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
+            _repository = new Repository<Entity.DepartmentUser>(database);
+            _mapper = mapper;
+            _cache = cache;
+        }
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+        /// <summary>
+        /// 根据部门ID获取用户
+        /// </summary>
+        /// <param name="departmentId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<int>> GetUserIdsAsync(int departmentId)
+        {
+            return await _repository.GetAllAsync<int>(Q.Where(nameof(Entity.DepartmentUser.DepartmentId), departmentId).Select(nameof(Entity.DepartmentUser.UserId)));
+        }
+        /// <summary>
+        /// 添加部门成员
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> AddDepartmentUserAsync(DepartmentUserInRequest request)
+        {
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    //删除
+                    await _repository.DeleteAsync(Q.Where(nameof(Entity.DepartmentUser.DepartmentId), request.DepartmentId));
+                    foreach (var item in request.UserIds)
+                    {
+                        var entity = new Entity.DepartmentUser()
+                        {
+                            DepartmentId = request.DepartmentId,
+                            UserId = item
+                        };
+                        await _repository.InsertAsync(entity);
+                    }
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 添加部门成员
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> AddDepartmentUserAsync(IEnumerable<int> departmentIds, int userId)
+        {
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    //删除
+                    await _repository.DeleteAsync(Q.Where(nameof(Entity.DepartmentUser.UserId), userId));
+                    foreach (var item in departmentIds)
+                    {
+                        var entity = new Entity.DepartmentUser()
+                        {
+                            DepartmentId = item,
+                            UserId = userId
+                        };
+                        await _repository.InsertAsync(entity);
+                    }
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}

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

@@ -25,6 +25,7 @@ using Dapper;
 using GxPress.Result.App.User;
 using GxPress.Result.Job;
 using GxPress.Common.Http;
+using GxPress.Repository.Interface.DepartmentUser;
 
 namespace GxPress.Repository.Implement
 {
@@ -40,8 +41,9 @@ namespace GxPress.Repository.Implement
         //private readonly string _databaseTypestr;
         private readonly string _connectionString;
         private readonly string _databaseTypeStr;
+        private readonly IDepartmentUserRepository departmentUserRepository;
         public UserRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper,
-            IWebHostEnvironment environment, IDistributedCache cache)
+            IWebHostEnvironment environment, IDistributedCache cache, IDepartmentUserRepository departmentUserRepository)
         {
             _databaseTypeStr = dbOptionsAccessor.CurrentValue.DatabaseType;
             _connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
@@ -57,6 +59,7 @@ namespace GxPress.Repository.Implement
             _roleRepository = new Repository<Role>(database);
             _mapper = mapper;
             _cache = cache;
+            this.departmentUserRepository = departmentUserRepository;
         }
 
         public IDatabase Database => _repository.Database;
@@ -385,8 +388,10 @@ namespace GxPress.Repository.Implement
         {
             var user = await GetAsync(id);
             if (user == null) throw new BusinessException("该用户不存在");
-            if (request.DepartmentId > 0)
-                user.DepartmentId = request.DepartmentId;
+            if (request.DepartmentId.Count() > 0)
+            {
+                await departmentUserRepository.AddDepartmentUserAsync(request.DepartmentId, id);
+            }
             if (!string.IsNullOrEmpty(request.Nick))
                 user.Nick = request.Nick;
             if (!string.IsNullOrEmpty(request.Description))

gx_api/GxPress/Repository/GxPress.Repository.Interface/DepartmentUser/IDepartmentUserRepository.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Datory;
+using GxPress.Request.Department;
+
+namespace GxPress.Repository.Interface.DepartmentUser
+{
+    public interface IDepartmentUserRepository : IRepository
+    {
+        /// <summary>
+        /// 根据部门ID获取用户
+        /// </summary>
+        /// <param name="departmentId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<int>> GetUserIdsAsync(int departmentId);
+        /// <summary>
+        /// 添加部门成员
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> AddDepartmentUserAsync(DepartmentUserInRequest request);
+          /// <summary>
+        /// 添加部门成员
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+       Task<bool> AddDepartmentUserAsync(IEnumerable<int> departmentIds, int userId);
+    }
+}

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

@@ -23,6 +23,7 @@ using GxPress.EnumConst;
 using GxPress.Request.App.Flow;
 using GxPress.Repository.Interface.WaitHandle;
 using GxPress.Request.AddressBookGroup;
+using GxPress.Repository.Interface.DepartmentUser;
 
 namespace GxPress.Service.Implement
 {
@@ -39,9 +40,10 @@ namespace GxPress.Service.Implement
         private readonly IFlowRepository _flowRepository;
         private readonly IFlowTodoRepository _flowTodoRepository;
         private readonly IWaitHandleRepository waitHandleRepository;
+        private readonly IDepartmentUserRepository departmentUserRepository;
         public UserService(IUserRepository userRepository, IDepartmentRepository departmentRepository,
             IAddressBookGroupRepository addressBookGroupRepository, IBlacklistUserRepository blacklistUserRepository,
-            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository)
+            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository, IDepartmentUserRepository departmentUserRepository)
         {
 
             _userRepository = userRepository;
@@ -55,6 +57,7 @@ namespace GxPress.Service.Implement
             _flowRepository = flowRepository;
             _flowTodoRepository = flowTodoRepository;
             this.waitHandleRepository = waitHandleRepository;
+            this.departmentUserRepository = departmentUserRepository;
         }
 
         /// <summary>
@@ -221,6 +224,8 @@ namespace GxPress.Service.Implement
             var query = Q.NewQuery();
             if (departmentId > 0)
             {
+                var userIds = await departmentUserRepository.GetUserIdsAsync(departmentId);
+                query.WhereIn(nameof(User.Id), userIds);
                 query.Where(nameof(User.DepartmentId), departmentId);
             }
 
@@ -257,7 +262,9 @@ namespace GxPress.Service.Implement
             var query = Q.ForPage(page, perPage);
             if (departmentId > 0)
             {
-                query.Where(nameof(User.DepartmentId), departmentId);
+                var userIds = await departmentUserRepository.GetUserIdsAsync(departmentId);
+                query.WhereIn(nameof(User.Id), userIds);
+                //query.Where(nameof(User.DepartmentId), departmentId);
             }
 
             if (roleId > 0)
@@ -283,7 +290,9 @@ namespace GxPress.Service.Implement
             var query = Q.ForPage(request.Page, request.PerPage);
             if (request.DepartmentId > 0)
             {
-                query.Where(nameof(User.DepartmentId), request.DepartmentId);
+                var userIds = await departmentUserRepository.GetUserIdsAsync(request.DepartmentId);
+                query.WhereIn(nameof(User.Id), userIds);
+                //query.Where(nameof(User.DepartmentId), request.DepartmentId);
             }
 
             if (request.RoleId > 0)
@@ -401,5 +410,57 @@ namespace GxPress.Service.Implement
             };
             return result;
         }
+        /// <summary>
+        /// 更新用户信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateAsync(int id, UserInfoRequest request)
+        {
+            var user = await _userRepository.GetAsync(id);
+            if (user == null) throw new BusinessException("该用户不存在");
+            if (request.DepartmentId.Count() > 0)
+            {
+                await departmentUserRepository.AddDepartmentUserAsync(request.DepartmentId, id);
+            }
+            if (!string.IsNullOrEmpty(request.Nick))
+                user.Nick = request.Nick;
+            if (!string.IsNullOrEmpty(request.Description))
+                user.Description = request.Description;
+            if (!string.IsNullOrEmpty(request.Gender))
+                user.Gender = request.Gender;
+            if (!string.IsNullOrEmpty(request.Name))
+                user.Name = request.Name;
+            if (!string.IsNullOrEmpty(request.Position))
+                user.Position = request.Position;
+            if (request.RoleId > 0)
+                user.RoleId = request.RoleId;
+            if (!string.IsNullOrEmpty(request.Signature))
+                user.Signature = request.Signature;
+            //用户头像
+            if (!string.IsNullOrEmpty(request.AvatarUrl))
+            {
+                user.HistoryAvatarUrl = user.AvatarUrl;
+                user.AvatarUrl = StringUtils.RemoveDomain(request.AvatarUrl);
+            }
+            user.Email = request.Email;
+            if (!string.IsNullOrWhiteSpace(request.Phone))
+                user.Phone = request.Phone;
+            user.QRCoder = StringUtils.RemoveDomain(user.QRCoder);
+            if (request.IsDisable > 0)
+                user.IsDisable = request.IsDisable == 1;
+            if (request.IsFreeze > 0)
+                user.IsFreeze = request.IsFreeze == 1;
+            if (request.IsVip > 0)
+                user.IsVip = request.IsVip == 1;
+            if (request.IsLeader > 0)
+                user.IsLeader = request.IsLeader == 1;
+            if (request.IsMute > 0)
+                user.IsMute = request.IsMute == 1;
+            if (!string.IsNullOrWhiteSpace(request.DisableTiem))
+                user.DisableTiem = Convert.ToDateTime(request.DisableTiem);
+            return await _userRepository.UpdateAsync(user);
+        }
     }
 }

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

@@ -57,5 +57,12 @@ namespace GxPress.Service.Interface
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<UserLinkResult> GetUserLinkResultAsync(int userId);
+        /// <summary>
+        /// 更新用户信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> UpdateAsync(int id, UserInfoRequest request);
     }
 }