diff --git a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs index d74faaadc..af3195b2c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs @@ -82,14 +82,24 @@ namespace IRaCIS.Core.Application.Service /// /// [HttpPost] - public async Task GetAutoCutNextTask() + public async Task GetAutoCutNextTask() { - - return await _userRoleRepository.Where(x => x.Id == _userInfo.UserRoleId).Select(x => new + var result = await _userRoleRepository.Where(x => x.Id == _userInfo.UserRoleId).Select(x => new { AutoCutNextTask = x.AutoCutNextTask, IsDoubleScreen = x.IsDoubleScreen, }).FirstOrDefaultAsync(); + + if (result == null) + { + return new + { + AutoCutNextTask = false, + IsDoubleScreen = false, + }; + } + + return result; }