diff --git a/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs b/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs index 7eb7fd1..1a0d91e 100644 --- a/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs +++ b/src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs @@ -331,7 +331,8 @@ namespace Shentun.Peis.ColumnReferences [HttpPost("api/app/ColumnReference/GetInterfaceCodeValuesByAppCode")] public async Task> GetInterfaceCodeValuesByAppCode(ColumnReferenceInterfaceCodeValuesInputDto input) { - var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.CodeValue == input.CodeValue); + var columnReferenceCode = await _columnReferenceCodeRepository.FirstOrDefaultAsync(o => o.ColumnReferenceId == input.ColumnReferenceId && + o.CodeValue == input.CodeValue); if(columnReferenceCode == null) { return null; diff --git a/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs b/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs index 0106e5e..9e8d0a2 100644 --- a/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs +++ b/src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs @@ -325,6 +325,7 @@ namespace Shentun.Peis.CustomerOrgs CustomerOrgCode = p.CustomerOrgCode, TreeChildren = new List() }; + var customerOrgTreeChildList = GetTree(items.ToList(), null); diff --git a/test/Shentun.Peis.Application.Tests/CustomerOrgAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/CustomerOrgAppServiceTest.cs index e648500..82bbce6 100644 --- a/test/Shentun.Peis.Application.Tests/CustomerOrgAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/CustomerOrgAppServiceTest.cs @@ -3,6 +3,7 @@ using Shentun.Peis.GuideTypes; using Shentun.Peis.Models; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -50,13 +51,23 @@ namespace Shentun.Peis [Fact] public async Task GetByCodeAllAsync() { - - var list = await _appService.GetByCodeAllAsync("",0); - foreach (var item in list) + using (var unitOfWork = _unitOfWorkManager.Begin(isTransactional: true)) { - _output.WriteLine(item.DisplayName); + Stopwatch stopwatch = new Stopwatch(); + stopwatch.Start(); + var list = await _appService.GetByCodeAllAsync("", 0); + stopwatch.Stop(); + TimeSpan elapsed = stopwatch.Elapsed; + _output.WriteLine("代码运行时间:" + elapsed.TotalMilliseconds + "毫秒" + list.Count().ToString()); + //foreach (var item in list) + //{ + // _output.WriteLine(item.DisplayName); + //} + await unitOfWork.CompleteAsync(); } - + + + }