From abc90d78b97c9853ade2f8a87a3a95858b938492 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 23 Apr 2023 20:49:31 +0800
Subject: [PATCH] commit by yzf

---
 FactorySystemApi/Controllers/TeamworkController.cs |  6 +++---
 FactorySystemBll/ViewBll.cs                        | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs
index dd44e73..1611686 100644
--- a/FactorySystemApi/Controllers/TeamworkController.cs
+++ b/FactorySystemApi/Controllers/TeamworkController.cs
@@ -77,9 +77,9 @@ namespace FactorySystemApi.Controllers
             return ExceptionHelper.TryReturnException(() =>
             {
                 //对接获取
-                //inParam.Add("FMdmCode", GetMdmCode(inParam));
-                var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0"));
+                inParam.Add("FMdmCode", GetMdmCode(inParam));
+                //var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                //inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0"));
                 if (!inParam.ContainsKey("FMdmCode") || string.IsNullOrEmpty(inParam["FMdmCode"].ToString().Trim()))
                 {
                     apiResult.Error("获取MDM失败");
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();