yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修改营业点分页模糊搜索条件

Browse Source
This commit is contained in:
cheche
2024-03-05 16:58:46 +08:00
parent 40a0234bbf
commit ae29ddee87
8 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
View File

@@ -15,6 +15,7 @@ using MySqlX.XDevAPI.Relational;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
using System.Collections.Generic;
namespace Dlhis.Basic.Device.Services.Implements;
@@ -65,28 +66,16 @@ public class DeviceService : IDeviceService
foreach (var res in page.Data)
{
var list = new List<PlaceCodeNameDetil>();
var regis = Registries.Where(x => x.DeviceUniqueNo == res.UniqueNo).ToList();
if (regis!=null && regis.Count>0)
var regis = Registries.Where(x => x.DeviceUniqueNo == res.UniqueNo).FirstOrDefault();
if (regis != null)
{
foreach (var re in regis)
var place = BusinessPlaces.Where(x => x.Code == regis.BusinessPlaceCode).FirstOrDefault();
if (place != null)
{
var place = BusinessPlaces.Where(x => x.Code == re.BusinessPlaceCode)
.FirstOrDefault();
if (place != null)
{
var detil = new PlaceCodeNameDetil
{
BusinessPlaceCode = re.BusinessPlaceCode.ToString(),
BusinessPlaceName = place.Name
};
list.Add(detil);
}
}
res.BusinessPlaceCode = regis.BusinessPlaceCode.ToString();
res.BusinessPlaceName = place.Name;
}
}
res.detils = list;
}
page.Data.ForEach(device =>