|
|
|
@ -1,4 +1,5 @@
|
|
|
|
|
using com.sun.xml.@internal.ws.api.model; |
|
|
|
|
using com.sun.org.apache.bcel.@internal.generic; |
|
|
|
|
using com.sun.xml.@internal.ws.api.model; |
|
|
|
|
using Elight.Entity; |
|
|
|
|
using Elight.Entity.SystemModel; |
|
|
|
|
using Elight.Logic; |
|
|
|
@ -28,13 +29,15 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
private readonly WriteSysLog _logs;//操作日志 |
|
|
|
|
App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 |
|
|
|
|
private readonly ILogger<LoginController> _logger;//日志 |
|
|
|
|
private readonly WechatMessagerClient wechatMessagerClient; |
|
|
|
|
Result result = new Result(); |
|
|
|
|
public SystemControllerController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user) |
|
|
|
|
public SystemControllerController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, WechatMessagerClient _wechatMessagerClient) |
|
|
|
|
{ |
|
|
|
|
_logger = logger; |
|
|
|
|
_db = db; |
|
|
|
|
_logs = logs; |
|
|
|
|
_userdata = user.Userdata(); |
|
|
|
|
this.wechatMessagerClient = _wechatMessagerClient; |
|
|
|
|
} |
|
|
|
|
#endregion |
|
|
|
|
#region 用户管理 |
|
|
|
@ -61,7 +64,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
[Route("QueryUserlist")] |
|
|
|
|
public async Task<Result> QueryUserlist() |
|
|
|
|
{ |
|
|
|
|
var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin"&& q.usertype == 0).ToListAsync(); |
|
|
|
|
var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin" && q.usertype == 0).ToListAsync(); |
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
result.result = Unitlist.OrderByDescending(q => q.createtime).ToList(); |
|
|
|
|
return result; |
|
|
|
@ -85,7 +88,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
.WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) |
|
|
|
|
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) |
|
|
|
|
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) |
|
|
|
|
.Where(q => q.IsDeleted == 0 &&q.phone!="admin" && q.usertype == 0) |
|
|
|
|
.Where(q => q.IsDeleted == 0 && q.phone != "admin" && q.usertype == 0) |
|
|
|
|
.ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); |
|
|
|
|
UserModel.RowsCount = totalNumber; |
|
|
|
|
list.ForEach(q => |
|
|
|
@ -134,7 +137,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
.WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) |
|
|
|
|
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) |
|
|
|
|
.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) |
|
|
|
|
.Where(q => q.IsDeleted == 0 && q.usertype == 1).ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); |
|
|
|
|
UserModel.RowsCount = totalNumber; |
|
|
|
|
var data = new QueryResult<App_Sys_UserModel>(UserModel, list); |
|
|
|
@ -196,7 +199,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
{ |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id== UserModel.Id).FirstAsync(); |
|
|
|
|
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == UserModel.Id).FirstAsync(); |
|
|
|
|
if (model == null) |
|
|
|
|
{ |
|
|
|
|
result.IsSucceed = false; |
|
|
|
@ -211,7 +214,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
model.Password= newpass; |
|
|
|
|
model.Password = newpass; |
|
|
|
|
|
|
|
|
|
_db.BeginTran(); |
|
|
|
|
var num = await _db.Updateable(model).UpdateColumns(it => new { it.Password }).ExecuteCommandAsync(); |
|
|
|
@ -243,16 +246,16 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
{ |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id== UserModel.Id).FirstAsync(); |
|
|
|
|
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == UserModel.Id).FirstAsync(); |
|
|
|
|
if (model != null) |
|
|
|
|
{ |
|
|
|
|
model.unitCode=UserModel.unitCode; |
|
|
|
|
model.department=UserModel.department; |
|
|
|
|
model.name=UserModel.name; |
|
|
|
|
model.sex=UserModel.sex; |
|
|
|
|
model.duties=UserModel.duties; |
|
|
|
|
model.phone=UserModel.phone; |
|
|
|
|
model.cardId=UserModel.cardId; |
|
|
|
|
model.unitCode = UserModel.unitCode; |
|
|
|
|
model.department = UserModel.department; |
|
|
|
|
model.name = UserModel.name; |
|
|
|
|
model.sex = UserModel.sex; |
|
|
|
|
model.duties = UserModel.duties; |
|
|
|
|
model.phone = UserModel.phone; |
|
|
|
|
model.cardId = UserModel.cardId; |
|
|
|
|
} |
|
|
|
|
_db.BeginTran(); |
|
|
|
|
var num = await _db.Updateable(model).UpdateColumns(it => new { it.unitCode, it.department, it.name, it.sex, it.duties, it.phone, it.cardId }).ExecuteCommandAsync(); |
|
|
|
@ -328,7 +331,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
result.IsSucceed = false; |
|
|
|
|
result.Message = "当前微信已与其他账号绑定"; |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == _userdata.Id && x.IsDeleted == 0).FirstAsync(); |
|
|
|
@ -585,7 +588,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
/// <returns>律师信息审核认证</returns> |
|
|
|
|
[HttpGet] |
|
|
|
|
[Route("Examine")] |
|
|
|
|
public async Task<Result> Examine(string Id, int status,string describe) |
|
|
|
|
public async Task<Result> Examine(string Id, int status, string describe) |
|
|
|
|
{ |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
@ -601,7 +604,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
if (num > 0) |
|
|
|
|
{ |
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
result.result = status==0?"认证通过":"认证不通过"; |
|
|
|
|
result.result = status == 0 ? "认证通过" : "认证不通过"; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
catch (System.Exception ex) |
|
|
|
@ -770,7 +773,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
//查询角色下的菜单 |
|
|
|
|
var list = await _db.Queryable<App_Sys_RoleMenuModel>().Where(q => q.roleId== RoleMenudata.Id).ToListAsync(); |
|
|
|
|
var list = await _db.Queryable<App_Sys_RoleMenuModel>().Where(q => q.roleId == RoleMenudata.Id).ToListAsync(); |
|
|
|
|
_db.BeginTran(); |
|
|
|
|
//删除角色下的菜单 |
|
|
|
|
await _db.Deleteable(list).ExecuteCommandAsync(); |
|
|
|
@ -1155,7 +1158,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
//添加单位前判断单位编码是否重复 |
|
|
|
|
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync(); |
|
|
|
|
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete == 0).FirstAsync(); |
|
|
|
|
if (data != null) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
@ -1197,7 +1200,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
//判断单位编码是否已存在 |
|
|
|
|
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync(); |
|
|
|
|
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete == 0).FirstAsync(); |
|
|
|
|
if (data != null) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
@ -1271,7 +1274,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
[Route("GetQueryMenulist")] |
|
|
|
|
public async Task<Result> GetQueryMenulist() |
|
|
|
|
{ |
|
|
|
|
var list = await _db.Queryable<App_Sys_MenuModel>().Where(q => q.IsDelete == 0 || q.pid==null || q.pid == "").Select(q => new { q.Id, q.name }).ToListAsync(); |
|
|
|
|
var list = await _db.Queryable<App_Sys_MenuModel>().Where(q => q.IsDelete == 0 || q.pid == null || q.pid == "").Select(q => new { q.Id, q.name }).ToListAsync(); |
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
result.result = list; |
|
|
|
|
return result; |
|
|
|
|