删除包装DelPackag去除admin账户验证

admin

3 天以前 6118cb61e1bf128f454492eb40491fffc37e1cf2

 Wms/WMS.BLL/SysServer/UserInforServer.cs

@@ -26,6 +26,7 @@
        private readonly IFunSettingServer _setting;
        private static readonly SqlSugarScope Db = DataContext.Db;
        private readonly UserManager _userManager;

        public UserInforServer(IMapper mapper, IFunSettingServer setting, UserManager userManager)
        {
            _mapper = mapper;
@@ -33,8 +34,11 @@
            _userManager = userManager;
        }

        public async Task<int> LoginAdmin(string loginName, string loginPwd)

        public async Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd)
        {
            UserInfoDto userDto = new UserInfoDto();

            //查询密码已错误次数
            string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'";
            int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql);
@@ -57,11 +61,16 @@

                        //最后登陆时间
                        await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
                        return modUser.Id;

                        userDto.Id = modUser.Id;
                        userDto.RealName = modUser.RealName;
                        return userDto;
                    }
                    else //当前账号被禁用
                    {
                        return 0;
                        userDto.Id = 0;
                        userDto.RealName = "";
                        return userDto;
                    }
                }
                else //账号密码不正确或没有此账号
@@ -70,12 +79,20 @@
                    string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'";
                    int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql);

                    return -1;
                    userDto.Id = -1;
                    userDto.RealName = "";
                    return userDto;
                }
            }
            else//锁定账号
            {
                return -2;
                //账号改为停用
                string uptUserStatusSql = $@"update SysUserInfor set Status=1 where UserName='{loginName}'";
                int uptUserStatus = Db.Ado.ExecuteCommand(uptUserStatusSql);

                userDto.Id = -2;
                userDto.RealName = "";
                return userDto;
            }

        }
@@ -181,7 +198,7 @@
        public async Task<int> UpdateUserinfo(UserInfoDto userdto)
        {
            //映射数据模型
            SysUserInfor userlist = _mapper.Map<SysUserInfor>(userdto);
            SysUserInfor userInfo = _mapper.Map<SysUserInfor>(userdto);
            //判断用户号是否唯一
            int count = await GetUserInfoByNo(userdto.UserNo, userdto.UserName, userdto.Id);
            int i = 0;
@@ -193,9 +210,22 @@
            {
                userdto.UpdateUser = _userManager.UserId;
                userdto.UpdateTime = DateTime.Now;
                i = await Db.Updateable(userlist)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.UpdateUser, s.UpdateTime })

                //状态恢复正常，清除密码错误次数
                if (userdto.Status == "0")
                {
                    userInfo.PwdErrNum = 0;
                    i = await Db.Updateable(userInfo)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.PwdErrNum, s.UpdateUser, s.UpdateTime })
                    .ExecuteCommandAsync();
                }
                else
                {
                    i = await Db.Updateable(userInfo)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.UpdateUser, s.UpdateTime })
                    .ExecuteCommandAsync();
                }

                if (i <= 0)
                    throw Oops.Bah("编辑用户信息失败");
            }