linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整登录逻辑

develop-lawyerExampaper
胡超1 2 years ago
parent
a5e7a55383
commit
fdd2ea4062
1 changed files with 30 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      24Hour/Controllers/LoginController.cs

49
24Hour/Controllers/LoginController.cs
Unescape View File

@ -435,7 +435,7 @@ namespace _24Hour.Controllers
//}
if (string.IsNullOrEmpty(UserModel.wechatId) == false)
{
if (await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0&&x.audit!=1))
if (await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0 && x.audit != 1))
{
ret.IsSucceed = false;
ret.Message = "当前微信已与其他账号绑定";
@ -556,7 +556,7 @@ namespace _24Hour.Controllers
[Route("cardIdLogin")]
public async Task<Result> cardIdLogin(string cardId, string name)
{
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.cardId == cardId).FirstAsync();
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId && q.name == name).FirstAsync();
if (date != null)
{
//if (date.usertype == 1 && date.audit == null)
@ -572,7 +572,7 @@ namespace _24Hour.Controllers
// return ret;
// }
// else
if (date.usertype == 0 && date.becurrent == 1)
if (date.usertype == 0 && date.becurrent == 1 && date.isdeactivate==1)
{
ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！";
@ -615,23 +615,34 @@ namespace _24Hour.Controllers
ret.IsSucceed = true;
}
else
{
var UserModel = new App_Sys_UserModel();
_db.BeginTran();
UserModel.Id = Guid.NewGuid().ToString();
UserModel.cardId = cardId;
UserModel.name = name;
UserModel.usertype = 1;
string cardIdpwa = UserModel.cardId.Substring(UserModel.cardId.Length - 6);
//默认密码身份证后六位
UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{cardIdpwa}").ToLower();
var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
ret.IsSucceed = true;
ret.result = "添加成功";
{
var datea = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId).FirstAsync();
if (datea==null)
{
var UserModel = new App_Sys_UserModel();
_db.BeginTran();
UserModel.Id = Guid.NewGuid().ToString();
UserModel.cardId = cardId;
UserModel.name = name;
UserModel.usertype = 1;
string cardIdpwa = UserModel.cardId.Substring(UserModel.cardId.Length - 6);
//默认密码身份证后六位
UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{cardIdpwa}").ToLower();
var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
ret.IsSucceed = true;
ret.result = "添加成功";
}
}
else
{
ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！";
return ret;
}
}
return ret;
}

Write Preview
Loading…
Cancel
Save