From d0f6f21edf625b23e6036bb620b83070e4383b2f Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Sun, 23 Jun 2024 01:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ColumnReferences/ColumnReferencePlugInsDbBase.cs | 6 +++++- src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsDbBase.cs b/src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsDbBase.cs index 2934747..8cf51a2 100644 --- a/src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsDbBase.cs +++ b/src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsDbBase.cs @@ -30,7 +30,11 @@ namespace Shentun.Peis.PlugIns.ColumnReferences var list = (await conn.QueryAsync(InterfaceSql)).ToList(); foreach (var item in list) { - item.SimpleCode = LanguageConverter.GetPYSimpleCode(item.DisplayName); + if(string.IsNullOrWhiteSpace(item.SimpleCode)) + { + item.SimpleCode = LanguageConverter.GetPYSimpleCode(item.DisplayName); + } + } return list; } diff --git a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs index d152b78..142b3f6 100644 --- a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs +++ b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs @@ -341,7 +341,8 @@ namespace Shentun.Peis.LisRequests // { // return; // } - var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest + var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest + && o.IsActive == 'Y' )) .OrderBy(o => o.DisplayOrder).ToList(); foreach (var thirdInterface in thirdInterfaces)