diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs index 766fb8b..27e4c55 100644 --- a/FactorySystemBll/ViewBll.cs +++ b/FactorySystemBll/ViewBll.cs @@ -843,12 +843,20 @@ namespace FactorySystemBll string sql = ""; if (tempId > 0) { - sql = string.Format(@"SELECT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID WHERE a.FTeamID={0}", tempId); + sql = string.Format(@"SELECT + DISTINCT + a.*, + c.FName AS 'FUserName' + FROM + TFS_Material AS a + LEFT JOIN TUser AS c ON a.FEditUser= c.FID + WHERE + a.FID IN(SELECT FMaterialFormulaIDs FROM TFS_FTeamwork WHERE FID='{0}');", tempId); } else { - sql = string.Format(@"SELECT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID "); + sql = string.Format(@"SELECT DISTINCT b.*,c.FName AS 'FUserName' FROM TFS_ViewMaterial AS a LEFT JOIN TFS_Material AS b ON a.FMaterialID=b.FID LEFT JOIN TUser AS c ON b.FEditUser=c.FID "); } SqlSugarClient db = AppSettingsHelper.GetSqlSugar();