Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemApi

3 years ago · d309b5e8bc
parent 67e4690927 a4bddcdaa0
commit d309b5e8bc
1 changed files with 10 additions and 2 deletions
--- 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();