From 522ac9b05e062a53218832e5c2576b4e23ea4834 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 26 Jan 2024 18:33:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/CanteenSettingService.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index 4f6a4446..11309527 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs @@ -2,16 +2,11 @@ using Dlhis.Canteen.Setting.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Enums; -using Kurisu.AspNetCore.UnifyResultAndValidation; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; -using Newtonsoft.Json.Linq; -using System; -using System.ComponentModel.DataAnnotations; -using System.Globalization; namespace Dlhis.Canteen.Setting.Services.Implements; @@ -30,11 +25,10 @@ public class CanteenSettingService : ICanteenSettingService public async Task> GetPageAsync(CanteenSettingPageRequest request) { var page = await _context.Queryable() - .LeftJoin((setting, user) => setting.UniqueValue == user.UserNo) .WhereIF(request.UniqueType.HasValue, setting => setting.UniqueType == request.UniqueType) .WhereIF(request.Item.HasValue, setting => setting.Item == request.Item) .WhereIF(request.Search.IsPresent(), setting => setting.Catalog.Contains(request.Search)) - .Select((setting, user) => new CanteenSettingResponse + .Select((setting) => new CanteenSettingResponse { Id = setting.Id, UniqueType = setting.UniqueType, @@ -46,6 +40,15 @@ public class CanteenSettingService : ICanteenSettingService }) .ToPageListAsync(request); + var userNos = page.Data.Select(x => x.UniqueValue).Distinct().ToList(); + + var gainfos = await _context.Queryable().Where(x => userNos.Contains(x.No)).ToListAsync(); + + page.Data.ForEach(x => + { + x.UniqueValue = gainfos.FirstOrDefault(item => item.No == x.UniqueValue)?.Name; + }); + return page; }