From 90576189664d49f98d1e0951788b5e2b829b584c Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Wed, 31 May 2023 14:46:11 +0800
Subject: [PATCH] bug

---
 BasicData/Tnb.BasicData/BasMaterialService.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs
index 20179695..831b10d5 100644
--- a/BasicData/Tnb.BasicData/BasMaterialService.cs
+++ b/BasicData/Tnb.BasicData/BasMaterialService.cs
@@ -90,8 +90,8 @@ namespace Tnb.BasicData
                 BasEbomH ebom = await db.Queryable<BasEbomH>().Where(x => x.id == queryInput.ebom_id).SingleAsync();
                 ids.Add(ebom.material_id);
                 var result = await db.Queryable<BasMaterial>()
-                    .LeftJoin<DictionaryDataEntity>((a, b) => a.unit_id == b.EnCode)
-                    .LeftJoin<DictionaryTypeEntity>((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null)
+                    .LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
+                    .LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
                     .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
                     .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id))
                     .Select((a, b, c) => new MaterialSelectOutput()
@@ -101,7 +101,7 @@ namespace Tnb.BasicData
                         name = a.name,
                         descrip = a.descrip,
                         unit_id = a.unit_id,
-                        unit_name = b.FullName,
+                        unit_name = c.FullName,
                     }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
 
                 return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);
@@ -110,8 +110,8 @@ namespace Tnb.BasicData
             else
             {
                 var result = await db.Queryable<BasMaterial>()
-                    .LeftJoin<DictionaryDataEntity>((a, b) => a.unit_id == b.EnCode)
-                    .LeftJoin<DictionaryTypeEntity>((a, b, c) => b.DictionaryTypeId == c.Id && c.EnCode == DictConst.MeasurementUnit && c.DeleteMark == null)
+                    .LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
+                    .LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
                     .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
                     .Select((a, b, c) => new MaterialSelectOutput()
                     {
@@ -120,7 +120,7 @@ namespace Tnb.BasicData
                         name = a.name,
                         descrip = a.descrip,
                         unit_id = a.unit_id,
-                        unit_name = b.FullName,
+                        unit_name = c.FullName,
                     }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
 
                 return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);