|
@@ -626,14 +626,9 @@ namespace OASystem.API.Controllers
|
|
Regex r = new Regex("And");
|
|
Regex r = new Regex("And");
|
|
sqlWhere = r.Replace(sqlWhere, "Where", 1);
|
|
sqlWhere = r.Replace(sqlWhere, "Where", 1);
|
|
}
|
|
}
|
|
- string userSqlWhere = string.Format(@"Select sc.CompanyName,sd.DepName,sjp.JobName,su.* From Sys_Users su
|
|
|
|
- Inner Join Sys_Company sc On su.CompanyId = sc.Id
|
|
|
|
- Inner Join Sys_Department sd On su.DepId = sd.Id
|
|
|
|
- Inner Join Sys_JobPost sjp On su.JobPostId = sjp.Id {0}", sqlWhere);
|
|
|
|
- var _userList =_userRep.GetListBySqlWithNolock(userSqlWhere);
|
|
|
|
|
|
+ List<UserInfo> _userList =await _userRep.QueryUser(sqlWhere);
|
|
if (_userList.Count == 0)
|
|
if (_userList.Count == 0)
|
|
{
|
|
{
|
|
-
|
|
|
|
return Ok(JsonView(false, "暂无数据!"));
|
|
return Ok(JsonView(false, "暂无数据!"));
|
|
}
|
|
}
|
|
List<UserInfoWebView> userList = _mapper.Map<List<UserInfoWebView>>(_userList);
|
|
List<UserInfoWebView> userList = _mapper.Map<List<UserInfoWebView>>(_userList);
|