From ec4b1c58efff3a2f7ea168bc0338cafbfaccba4d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 13 Feb 2023 17:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/Dto/DefaultShortcutKeyViewModel.cs | 2 ++
.../Service/Reading/ShortcutKey/ShortcutKeyService.cs | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/DefaultShortcutKeyViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/DefaultShortcutKeyViewModel.cs
index a7f55ff6..14d8c1f0 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/DefaultShortcutKeyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/DefaultShortcutKeyViewModel.cs
@@ -51,6 +51,8 @@ namespace IRaCIS.Core.Application.ViewModel
public class DefaultShortcutKeyQuery
{
public int ImageToolType { get; set; }
+
+ public int? ShortcutKeyEnum { get; set; }
}
/// DefaultShortcutKeyAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs
index 3ff06dcd..fcde207c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs
@@ -37,7 +37,8 @@ namespace IRaCIS.Core.Application.Service
public async Task> GetDefaultShortcutKeyList(DefaultShortcutKeyQuery inQuery)
{
var defaultShortcutKey = await _defaultShortcutKeyRepository.Where(x => x.ImageToolType == inQuery.ImageToolType).ToListAsync();
- var shortcutKeydic = await _dictionaryRepository.Where(x => x.Parent.Code == "ShortcutKey").ToListAsync();
+ var shortcutKeydic = await _dictionaryRepository.Where(x => x.Parent.Code == "ShortcutKey")
+ .WhereIf(inQuery.ShortcutKeyEnum!=null,x=>x.Code==inQuery.ShortcutKeyEnum.ToString()).ToListAsync();
List result = new List();