完成一些用户相关逻辑修正

移动系统liao

2025-08-25 5260559b412b12b2b919b91fd4691d5a9fe3bd35

 Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs

@@ -147,7 +147,10 @@
            {
                CusExtendId = dd.Id,
                ExRoleId = ExRole.Id ?? 0,
                steps = CusExtendStep.UNExamine
                steps = CusExtendStep.UNExamine,
                CreateTime = DateTime.Now,
                CreateUserName = "企业用户:" + ThisUser?.Name,
                CreateUserId = ThisUser?.Id


            };
@@ -249,6 +252,10 @@
            ExRoleId = rols.Id,
            CusExtendId = user.CusExtendId,
            steps= CusExtendStep.UNExamine,
        
            CreateTime = DateTime.Now,
            CreateUserName = "企业用户:" + ThisUser?.Name,
            CreateUserId = ThisUser?.Id,
        });


@@ -448,7 +455,7 @@
        }
        if (!await isManger())
            throw Oops.Oh("用户没有权限");
         return (await  _fBS_CustormerUsersRep.GetListAsync(x => x.CusExtendId == id&&x.IsEn==true)).Adapt<List<FBS_CustormerUsersOutput>>();
         return (await  _fBS_CustormerUsersRep.GetListAsync(x => x.CusExtendId == id)).Adapt<List<FBS_CustormerUsersOutput>>();
    }
    public FBS_CustormerUsers? ThisUser { get; set; }
    /// <summary>
@@ -521,14 +528,14 @@
          
        }
        var User = await _fBS_CustormerUsersRep.GetFirstAsync(x =>x.CusExtendId==ThisUser.CusExtendId &&x.Id== CustormerUserId);
        if (User != null)
        if (User == null)
        {
            throw Oops.Oh("用户不存在");
        }
        if(User.IsEn==false)
            throw Oops.Oh("无效用户不可设置为管理员");

        User.IsManager = true;
        User.IsManager = !User.IsManager;
        User.UpdateTime = DateTime.Now;
        User.UpdateUserName= "企业用户:" + ThisUser?.Name;
        User.UpdateUserId = ThisUser.Id;
@@ -581,13 +588,13 @@
        {
            throw Oops.Oh("Id错误");
        }
        if(Param.CusExtendId!=Param.Id)
        if(Param.CusExtendId!= cid)
        {
            throw Oops.Oh("组织机构不同不可修改");
        }
    
        var User = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.CusExtendId == Param.CusExtendId && x.Id == Param.Id);
        if (User != null)
        if (User == null)
        {
            throw Oops.Oh("用户不存在");
        }
@@ -602,6 +609,48 @@


    }

    /// <summary>
    /// 删除员工
    /// </summary>
    /// <param name="CustormerUserId"> UserList 的ID</param>
    /// <returns></returns>
    [HttpDelete]
    public async Task<bool> DelCustormerUsers(long CustormerUserId)
    {
        if (!await isManger())
            throw Oops.Oh("用户没有权限");
        var cid = App.User.FindFirst(ClaimConst.CustomerExId)?.Value.ToLong() ?? 0;
        if (cid == 0)
        {
            throw Oops.Oh("用户凭证错误");

        }
        var uid = App.User.FindFirst(ClaimConst.UserId)?.Value.ToLong() ?? 0;
        if (uid == 0)
        {
            

        }
        if (CustormerUserId == uid)
            throw Oops.Oh("自己不可删除自己");
        if (ThisUser == null)
        {

            ThisUser = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.Id == uid && x.CusExtendId == cid && x.IsEn == true);

        }
        var User = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.CusExtendId == ThisUser.CusExtendId && x.Id == CustormerUserId);
        if (User == null)
        {
            throw Oops.Oh("用户不存在");
        }
        return await _fBS_CustormerUsersRep.DeleteByIdAsync(CustormerUserId);



    }

    /// <summary>
    /// 权限验证是否是管理员
    /// </summary>