diff --git a/BasicData/Tnb.BasicData/BasDefectService.cs b/BasicData/Tnb.BasicData/BasDefectService.cs index 2ee6d6ba..b9fcd432 100644 --- a/BasicData/Tnb.BasicData/BasDefectService.cs +++ b/BasicData/Tnb.BasicData/BasDefectService.cs @@ -36,8 +36,16 @@ namespace Tnb.BasicData return await _repository.AsSugarClient().Queryable() .LeftJoin((a, b) => a.process_id == b.id) .LeftJoin((a, b, c) => a.defective_id == c.id) - .Where((a, b, c) => a.process_id == processId) - .Select((a, b, c) => c).ToListAsync(); + .LeftJoin((a,b,c,d)=>c.defect_type_id==d.id) + .Where((a, b, c) => a.process_id == processId && c.enabled==1) + .Select((a, b, c,d) => new + { + id = c.id, + defect_code = c.defect_code, + defect_name = c.defect_name, + defect_type_id = d.defect_type_name, + defect_type_id_id = d.id + }).ToListAsync(); } } } \ No newline at end of file