|
@@ -250,11 +250,9 @@ namespace OASystem.API.Controllers
|
|
|
#region 限制人员登录
|
|
|
var userInfo = await _sqlSugar
|
|
|
.Queryable<Sys_Users>()
|
|
|
- .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
|
|
|
- .Where((u, d) => u.Id == dto.UserId)
|
|
|
- .Select((u, d) => new
|
|
|
+ .Where((u) => u.Id == dto.UserId)
|
|
|
+ .Select((u) => new
|
|
|
{
|
|
|
- DepName = d.DepName,
|
|
|
CnName = u.CnName
|
|
|
})
|
|
|
.FirstAsync();
|
|
@@ -266,10 +264,10 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
|
|
|
|
//其他市场部人员 限制登录时间段
|
|
|
- var currentDateTime = DateTime.Now;
|
|
|
- var startTime = DateTime.Parse(_config["ApiAccessTime:StartTime"]);
|
|
|
- var endTime = DateTime.Parse(_config["ApiAccessTime:EndTime"]);
|
|
|
- if (currentDateTime < startTime && currentDateTime > endTime) return Ok(JsonView(204, "NO ACCESS!!", ""));
|
|
|
+ //var currentDateTime = DateTime.Now;
|
|
|
+ //var startTime = DateTime.Parse(_config["ApiAccessTime:StartTime"]);
|
|
|
+ //var endTime = DateTime.Parse(_config["ApiAccessTime:EndTime"]);
|
|
|
+ //if (currentDateTime < startTime && currentDateTime > endTime) return Ok(JsonView(204, "NO ACCESS!!", ""));
|
|
|
#endregion
|
|
|
|
|
|
int messageUnReadCount = 0;
|