|
@@ -848,13 +848,13 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
//获取所有职位员工
|
|
|
var jobUserAll = await QueryUserList(new UserDto { PortType = 2, JobPostId = dto.Jpid });
|
|
|
- List<UserInfoWebView> users = null;
|
|
|
+ List<UserInfo> users = null;
|
|
|
var QueryUserListApiResult = (((jobUserAll as OkObjectResult).Value) as OASystem.Domain.ViewModels.JsonView);
|
|
|
if (QueryUserListApiResult != null)
|
|
|
{
|
|
|
if (QueryUserListApiResult.Code == 200)
|
|
|
{
|
|
|
- users = QueryUserListApiResult.Data as List<UserInfoWebView>;
|
|
|
+ users = QueryUserListApiResult.Data as List<UserInfo>;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -865,7 +865,7 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
//删除个人级岗位权限
|
|
|
isdel = await _UserAuthorityRepository.DeleteAsync<Sys_UserAuthority>(x => x.IsTemp == 1 &&
|
|
|
- x.UId == user.UserId);
|
|
|
+ x.UId == user.Id);
|
|
|
|
|
|
userAuth = adds.Select(x=> new Sys_UserAuthority
|
|
|
{
|
|
@@ -873,7 +873,7 @@ namespace OASystem.API.Controllers
|
|
|
CreateUserId = 235,
|
|
|
FId = x.FId,
|
|
|
SmId = x.SmId,
|
|
|
- UId = user.UserId,
|
|
|
+ UId = user.Id,
|
|
|
IsTemp = 1,
|
|
|
}).ToList();
|
|
|
|
|
@@ -986,8 +986,7 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
List<Sys_UserAuthority> userAuth = null;
|
|
|
//删除个人级岗位权限
|
|
|
- bool isdel = await _UserAuthorityRepository.DeleteAsync<Sys_UserAuthority>(x => x.IsTemp == 0 &&
|
|
|
- x.UId == dto.uid);
|
|
|
+ bool isdel = await _UserAuthorityRepository.DeleteAsync<Sys_UserAuthority>(x=> x.UId == dto.uid);
|
|
|
|
|
|
userAuth = adds.Select(x => new Sys_UserAuthority
|
|
|
{
|