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

修改登陆部分逻辑

develop-lawyerExampaper
胡超1 2 years ago
parent
c916acc3d8
commit
6b1bd6d844
1 changed files with 20 additions and 21 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. 41
      24Hour/Controllers/LoginController.cs

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

@ -13,6 +13,7 @@ using java.security;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using SqlSugar;
@ -337,22 +338,12 @@ namespace _24Hour.Controllers
[Route("WeChatLogin")]
public async Task<Result> WeChatLogin(string openId)
{
var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.wechatId == openId).FirstAsync();
var date = await _db.Queryable<App_Sys_UserModel>()
.Where(q => q.IsDeleted == 0 && q.wechatId == openId)
.OrderByDescending(x => x.createtime)
.FirstAsync();
if (date != null)
{
//if (date.usertype == 1 && date.audit == null)
//{
// ret.IsSucceed = false;
// ret.Message = "账号审核中！";
// return ret;
//}
//else if (date.usertype == 1 && date.audit == 1)
//{
// ret.IsSucceed = false;
// ret.Message = $"账号审核未通过，原因：{date.describe}！";
// return ret;
//}
//else
if (date.identity == "律师" && date.audit == 1)
{
ret.IsSucceed = false;
@ -365,6 +356,12 @@ namespace _24Hour.Controllers
ret.Message = "用户信息审核中！";
return ret;
}
if (date.isdeactivate == 1)
{
ret.IsSucceed = false;
ret.Message = "该账号已被禁用，请联系管理员！";
return ret;
}
if (date.usertype == 0 && date.becurrent == 1)
{
ret.IsSucceed = false;
@ -413,6 +410,7 @@ namespace _24Hour.Controllers
}
else
{
ret.IsSucceed = false;
ret.Message = "微信未授权，请先注册账号！";
}
@ -429,7 +427,8 @@ namespace _24Hour.Controllers
public async Task<Result> AddUser1(App_Sys_UserModel UserModel)
{
try
{
{
_logger.LogInformation(UserModel.ConvertToJsonStr());
//if (string.IsNullOrEmpty(UserModel.wechatId) && await _db.Queryable<App_Sys_UserModel>().AnyAsync(x => x.wechatId == UserModel.wechatId && x.IsDeleted == 0))
//{
// ret.IsSucceed = false;
@ -438,7 +437,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 && x.isdeactivate == 0))
{
ret.IsSucceed = false;
ret.Message = "当前微信已与其他账号绑定";
@ -465,7 +464,7 @@ namespace _24Hour.Controllers
{
_db.BeginTran();
data.audit = 2;
var num = await _db.Updateable(data).ExecuteCommandAsync();
var num = await _db.Updateable(data).IgnoreColumns(true).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
@ -575,7 +574,7 @@ namespace _24Hour.Controllers
// return ret;
// }
// else
if (date.usertype == 0 && date.becurrent == 1 && date.isdeactivate==1)
if (date.usertype == 0 && date.becurrent == 1 && date.isdeactivate == 1)
{
ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！";
@ -620,7 +619,7 @@ namespace _24Hour.Controllers
else
{
var datea = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.cardId == cardId).FirstAsync();
if (datea==null)
if (datea == null)
{
var UserModel = new App_Sys_UserModel();
_db.BeginTran();
@ -644,8 +643,8 @@ namespace _24Hour.Controllers
ret.IsSucceed = false;
ret.Message = $"用户未授权无法登录，请联系管理员！";
return ret;
}
}
}
return ret;
}

Write Preview
Loading…
Cancel
Save