diff --git a/SGGL/FineUIPro.Web/WorkBench.aspx.cs b/SGGL/FineUIPro.Web/WorkBench.aspx.cs index 4208e0ae..5cd0360d 100644 --- a/SGGL/FineUIPro.Web/WorkBench.aspx.cs +++ b/SGGL/FineUIPro.Web/WorkBench.aspx.cs @@ -143,6 +143,19 @@ namespace FineUIPro.Web { string returnDbHtml = ""; var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList(); + //调人力预警接口 + if (sType != "2") + { + var sgList = SGManPowerService.CheckAndSendPersonWarning(userId); + if (sgList != null) + { + foreach (var item in sgList) + { + getDataList.Add(item); + } + } + } + //把getDataList和sgList的数据合并 foreach (var item in getDataList) { returnDbHtml += "

" + item.ProjectCode + " " + "" + item.MenuName + " " + item.Content + "

" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "

";