修改灵活用功

小飞侠

2026-04-07 3ddd2f6bbf6757a35f935e386fa43552a9560487

 cylsg/cylsg.Application/Users/UserAppService.cs

@@ -10,6 +10,9 @@
using System.Security.Claims;
using System.Runtime.Intrinsics.Arm;
using MapsterMapper;
using ECTESTOA;
using cylsg.Model.OrderModel;


namespace cylsg.Application.Users
{
@@ -22,11 +25,15 @@
        private readonly ISystemService _systemService;
        private ISqlSugarClient _sqlSugarClient;
        private IMapper _mapper;
        public UserAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper)
        private readonly IOAServices _OAServices;
        public UserAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper 
            ,IOAServices oAServices
            )
        {
            _systemService = systemService;
            _sqlSugarClient = sqlSugarClient;
            _mapper = mapper;
            _OAServices = oAServices;
        }


@@ -63,8 +70,8 @@
            {
                userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);
            }
               

            //增加川印权限获取
            userDto.OAPermissions= await _OAServices.GetOAPermissions();


            return userDto;
@@ -117,9 +124,10 @@

            var userWorkerRes = new BaseRepository<UserWorker>();
            bool res;
            if (userWorkerDto.Id > 0)
            var userWorker1 = await userWorkerRes.GetFirstAsync(x => x.UserId == userid && x.IsEn == true && x.IsDeleted == false);
            if (userWorker1!=null)
            {
                var userWorker1 = await userWorkerRes.GetByIdAsync(userWorkerDto.Id);
               //.GetByIdAsync(userWorkerDto.Id);
                userWorker1.IdCardBack = userWorkerDto.IdCardBack;
                userWorker1.IdCardFace = userWorkerDto.IdCardFace;
                userWorker1.name = userWorkerDto.name;
@@ -206,9 +214,21 @@

            var userCompanyRes = new BaseRepository<UserCompany>();
            bool res;
            if (userCompanyDto.Id > 0)
            var userCompany1 = await userCompanyRes.GetFirstAsync(x=>x.UserId == userid && x.IsEn == true && x.IsDeleted == false);
            if (userCompany1 != null)
            {
                var userCompany1 = await userCompanyRes.GetByIdAsync(userCompanyDto.Id);
                if(userCompany1.Suppliercode != userCompanyDto.Suppliercode)
                {
                    var count = await userCompanyRes.CountAsync(x => x.Suppliercode == userCompanyDto.Suppliercode && x.Id != userCompany1.Id && x.IsEn == true && x.IsDeleted == false);
                    if (count > 0)
                    {
                        userCompany1.IsAdmin = false;
                    }
                    else
                    {
                        userCompany1.IsAdmin = true;
                    }
                }
                userCompany1.BusinessLicense = userCompanyDto.BusinessLicense;
                userCompany1.Suppliername = userCompanyDto.Suppliername;
                userCompany1.Regtime = userCompanyDto.Regtime;
@@ -227,6 +247,16 @@
            }
            else
            {
                var count = await userCompanyRes.CountAsync(x => x.Suppliercode == userCompanyDto.Suppliercode && x.IsEn == true && x.IsDeleted == false);
                if (count > 0)
                {
                    userCompanyDto.IsAdmin = false;
                }
                else
                {
                    userCompanyDto.IsAdmin = true;
                }

                var userCompany = _mapper.Map<UserCompany>(userCompanyDto);
                userCompany.UpDataBy = NickName;
                userCompany.UpDataTime = DateTime.Now;
@@ -272,9 +302,31 @@
            {
                userDto.userWorker = _mapper.Map<UserWorkerDto>(userWorker);
            }
            bool IsGuDing = false;
            var bdct = new BaseRepository<OrderBidding>();
            if (bdct == null)
            {
                var userBd = await bdct.GetFirstAsync(x => x.WorkerUserId == userid);
                if (userBd != null)
                {
                    IsGuDing = userBd.IsGuding ?? false;
                }
            }
            userDto.userWorker.IsLingHuoYongGong = IsGuDing;
            userDto.userWorker.Balance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0);
            if (IsGuDing)
            {
                userDto.userWorker.AvailableBalance = (userDto.userWorker.TiXianZonge - userDto.userWorker.YiTiXianJine - 300 < 0) ? 0 : (userDto.userWorker.TiXianZonge ?? 0 - userDto.userWorker.YiTiXianJine ?? 0 - 300);

            }
            else

                userDto.userWorker.AvailableBalance = userDto.userWorker.Balance;


            var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);


              var userCompany = await userCompanyRes.GetFirstAsync(p => p.UserId == userid);
            if (userCompany != null)
            {
                userDto.userCompany = _mapper.Map<UserCompanyDto>(userCompany);