|
|
@ -146,7 +146,7 @@ namespace _24Hour.Controllers.system |
|
|
|
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) |
|
|
|
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) |
|
|
|
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) |
|
|
|
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) |
|
|
|
.WhereIF(UserModel.audit != null, q => q.audit == UserModel.audit) |
|
|
|
.WhereIF(UserModel.audit != null, q => q.audit == UserModel.audit) |
|
|
|
.WhereIF(UserModel.isdeactivate >=0, q => q.isdeactivate == UserModel.isdeactivate) |
|
|
|
.WhereIF(UserModel.isdeactivate >= 0, q => q.isdeactivate == UserModel.isdeactivate) |
|
|
|
.Where(q => q.IsDeleted == 0 && q.usertype == 1) |
|
|
|
.Where(q => q.IsDeleted == 0 && q.usertype == 1) |
|
|
|
.ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); |
|
|
|
.ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); |
|
|
|
UserModel.RowsCount = totalNumber; |
|
|
|
UserModel.RowsCount = totalNumber; |
|
|
@ -260,7 +260,6 @@ namespace _24Hour.Controllers.system |
|
|
|
_logs.WriteSysLogadd("用户管理", "修改人员信息", result, _db); |
|
|
|
_logs.WriteSysLogadd("用户管理", "修改人员信息", result, _db); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary> |
|
|
|
/// <summary> |
|
|
|
/// 修改用户 |
|
|
|
/// 修改用户 |
|
|
|
/// </summary> |
|
|
|
/// </summary> |
|
|
@ -628,6 +627,114 @@ namespace _24Hour.Controllers.system |
|
|
|
_logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db); |
|
|
|
_logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary> |
|
|
|
|
|
|
|
/// 修改部门证件 departmentPhoto |
|
|
|
|
|
|
|
/// </summary> |
|
|
|
|
|
|
|
/// <param name="info"></param> |
|
|
|
|
|
|
|
/// <returns></returns> |
|
|
|
|
|
|
|
[HttpGet] |
|
|
|
|
|
|
|
[Route("EditDepartmentPhoto")] |
|
|
|
|
|
|
|
public async Task<Result> EditDepartmentPhoto(string photo) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
try |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.BeginTran(); |
|
|
|
|
|
|
|
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); |
|
|
|
|
|
|
|
userlist.ForEach(q => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
//头像地址 |
|
|
|
|
|
|
|
q.departmentPhoto = photo; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
var num = await _db.Updateable(userlist).ExecuteCommandAsync(); |
|
|
|
|
|
|
|
_db.CommitTran(); |
|
|
|
|
|
|
|
if (num > 0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
|
|
|
result.result = "替换成功"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
catch (System.Exception ex) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.RollbackTran(); |
|
|
|
|
|
|
|
result.IsSucceed = false; |
|
|
|
|
|
|
|
result.Message = ex.Message; |
|
|
|
|
|
|
|
LogService.WriteLog(ex, "用户部门证件替换"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
_logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db); |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/// <summary> |
|
|
|
|
|
|
|
/// 修改身份证件 Identityphoto |
|
|
|
|
|
|
|
/// </summary> |
|
|
|
|
|
|
|
/// <param name="info"></param> |
|
|
|
|
|
|
|
/// <returns></returns> |
|
|
|
|
|
|
|
[HttpGet] |
|
|
|
|
|
|
|
[Route("EditIdentityphoto")] |
|
|
|
|
|
|
|
public async Task<Result> EditIdentityphoto(string photo) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
try |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.BeginTran(); |
|
|
|
|
|
|
|
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); |
|
|
|
|
|
|
|
userlist.ForEach(q => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
//头像地址 |
|
|
|
|
|
|
|
q.identityphoto = photo; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
var num = await _db.Updateable(userlist).ExecuteCommandAsync(); |
|
|
|
|
|
|
|
_db.CommitTran(); |
|
|
|
|
|
|
|
if (num > 0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
|
|
|
result.result = "替换成功"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
catch (System.Exception ex) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.RollbackTran(); |
|
|
|
|
|
|
|
result.IsSucceed = false; |
|
|
|
|
|
|
|
result.Message = ex.Message; |
|
|
|
|
|
|
|
LogService.WriteLog(ex, "用户身份证件替换"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
_logs.WriteSysLogadd("用户管理", "用户身份证件替换", result, _db); |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/// <summary> |
|
|
|
|
|
|
|
/// 修改身份证 cardIdphoto |
|
|
|
|
|
|
|
/// </summary> |
|
|
|
|
|
|
|
/// <param name="info"></param> |
|
|
|
|
|
|
|
/// <returns></returns> |
|
|
|
|
|
|
|
[HttpGet] |
|
|
|
|
|
|
|
[Route("EditCardIdphoto")] |
|
|
|
|
|
|
|
public async Task<Result> EditCardIdphoto(string photo) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
try |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.BeginTran(); |
|
|
|
|
|
|
|
var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); |
|
|
|
|
|
|
|
userlist.ForEach(q => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
//头像地址 |
|
|
|
|
|
|
|
q.cardIdphoto= photo; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
var num = await _db.Updateable(userlist).ExecuteCommandAsync(); |
|
|
|
|
|
|
|
_db.CommitTran(); |
|
|
|
|
|
|
|
if (num > 0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
|
|
|
result.result = "替换成功"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
catch (System.Exception ex) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_db.RollbackTran(); |
|
|
|
|
|
|
|
result.IsSucceed = false; |
|
|
|
|
|
|
|
result.Message = ex.Message; |
|
|
|
|
|
|
|
LogService.WriteLog(ex, "用户身份证替换"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
_logs.WriteSysLogadd("用户管理", "用户身份证替换", result, _db); |
|
|
|
|
|
|
|
return result; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary> |
|
|
|
/// <summary> |
|
|
|
/// app--认证接口 |
|
|
|
/// app--认证接口 |
|
|
|