fix:去除创建用户时部门公司限制

zhengyuxuan

2025-03-24 537b0bbcb6e531c7f42a4f062ee3cd2da52cd02c

 LifePayment/LifePayment.Application/User/AccountService.cs

@@ -6,15 +6,18 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
using Volo.Abp.Caching;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Volo.Abp.Identity.Application.Contracts.Account;
using Volo.Abp.IdentityModel;
using ZeroD.Util;
using ZeroD.Util.Fadd;
using static LifePayment.Domain.Shared.LifePaymentConstant;


@@ -27,7 +30,10 @@
        private readonly IConfiguration _configuration;
        private readonly IIdentityModelAuthenticationService _authenticator;
        private readonly IRepository<User, Guid> _userRepository;
        private readonly IRepository<UserChannle, Guid> _userChannleRep;
        private readonly IIdentityUserAppService _identityUserService;
        private readonly IDistributedCache<string> _distributedCache;


        public AccountService(
               IWxManager wxManager,
@@ -35,7 +41,9 @@
               IIdentityModelAuthenticationService authenticator,
               IRepository<User, Guid> userRepository,
               IIdentityUserAppService identityUserService,
               IRepository<LifePayUser, Guid> lifePayUserRepository)
               IRepository<LifePayUser, Guid> lifePayUserRepository,
               IRepository<UserChannle, Guid> userChannleRep,
               IDistributedCache<string> distributedCache)
        {
            _configuration = configuration;
            _wxManager = wxManager;
@@ -43,19 +51,39 @@
            _lifePayUserRepository = lifePayUserRepository;
            _authenticator = authenticator;
            _userRepository = userRepository;
            _userChannleRep = userChannleRep;
            _distributedCache = distributedCache;
        }

        #region 查询

        public async Task<WxMiniAppIndentityInfo> GetLifePayWxIndentity(string code)
        {
            var res = await _wxManager.GetWxOauth2AccessToken(code);
            var result = new WxMiniAppIndentityInfo
            var cacheData = await _distributedCache.GetAsync(code);
            var result = new WxMiniAppIndentityInfo();
            if (cacheData != null)
            {
                SessionKey = res.SessionKey,
                OpenId = res.OpenId,
                UnionId = res.UnionId
            };
                result.OpenId = cacheData;
            }
            else
            {
                var res = await _wxManager.GetWxOauth2AccessToken(code);
                result = new WxMiniAppIndentityInfo
                {
                    SessionKey = res.SessionKey,
                    OpenId = res.OpenId,
                    UnionId = res.UnionId
                };
                if (!string.IsNullOrEmpty(res.OpenId))
                {
                    await _distributedCache.SetAsync(code, res.OpenId, options: new Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions()
                    {
                        AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(24)
                    });
                }

            }


            return result;
        }
@@ -92,6 +120,7 @@
                lifeUser = new LifePayUser()
                {
                    Id = GuidGenerator.Create(),
                    CreationChannleNum = input.CheckChannelId,
                    PhoneNumber = input.PhoneNumber,
                    LastLoginTime = DateTime.Now
                };
@@ -100,6 +129,7 @@
            }
            else
            {
                lifeUser.LastLoginChannleNum = input.CheckChannelId;
                lifeUser.LastLoginTime = DateTime.Now;
                await _lifePayUserRepository.UpdateAsync(lifeUser);
            }
@@ -123,25 +153,27 @@
            var user = await _userRepository.Where(r => r.UserName == accessRequestDto.UserName && !r.IsDeleted).FirstOrDefaultAsync();

            // 记录日志
           // await PublishUserOperateHistoryEvent(LogsSpecies.Login, LogsSpecies.Login, user.Id, user.Id, creatorName: user.Name);
            // await PublishUserOperateHistoryEvent(LogsSpecies.Login, LogsSpecies.Login, user.Id, user.Id, creatorName: user.Name);

            return result;
        }

        public async Task<Guid> CreateAccount(CreateAccountInput input, bool isSend, bool isAdminCreate = false, string password = null)
        public async Task<Guid> CreateAccount(CreateAccountInput input, bool isSend, bool isAdminCreate = false)
        {
            if (input.ClientId == LifePaymentConstant.ClientId.Back)
            {
                CheckExtensions.IfTrueThrowUserFriendlyException(!input.CompanyOrgId.HasValue || !input.DepartmentOrgId.HasValue,
                                                                 "所属公司和部门不能为空");
            }
            //if (input.ClientId == LifePaymentConstant.ClientId.Back)
            //{
            //    CheckExtensions.IfTrueThrowUserFriendlyException(!input.CompanyOrgId.HasValue || !input.DepartmentOrgId.HasValue,
            //                                                     "所属公司和部门不能为空");
            //}

            var any = await _userRepository.Where(x => x.PhoneNumber == input.PhoneNumber && x.ClientId == input.ClientId).AnyAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(any,
                                                             CustomeErrorMessage.PhoneNumberRepeatSaveFail);

            password ??= GlobalRandom.GetRandomPassword();
            /// input.Password ??= GlobalRandom.GetRandomPassword();

            CheckExtensions.IfTrueThrowUserFriendlyException(string.IsNullOrEmpty(input.Password),
                                                             "请输入密码");
            var res = await _identityUserService.CreateAsync(new IdentityUserCreateDto
            {
                Name = input.Name,
@@ -149,7 +181,7 @@
                UserName = input.UserName,
                RoleNames = input.RoleNames,
                ClientId = input.ClientId,
                Password = password,
                Password = input.Password,
            });
            var user = await _userRepository.InsertAsync(new User
            {
@@ -168,6 +200,19 @@
                DepartmentOrgId = input.ClientId == LifePaymentConstant.ClientId.Back ? input.DepartmentOrgId : null,
                CompanyOrgId = input.ClientId == LifePaymentConstant.ClientId.Back ? input.CompanyOrgId : null
            });

            List<UserChannle> userChannles = new List<UserChannle>();
            foreach (var item in input.ChannlesId)
            {
                userChannles.Add(new UserChannle()
                {
                    Id = Guid.NewGuid(),
                    ChannleId = item,
                    UserId = user.Id
                });
            }

            await _userChannleRep.InsertManyAsync(userChannles);
            //if (input.ClientId == Constant.ClientType.Back)
            //{
            //    await _distributedEventBus.PublishAsync(new SendPhoneMessageInput