Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -890,13 +890,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>;
                     }
                 }
 
@@ -1028,8 +1028,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
                 {