This commit is contained in:
geh
2025-12-26 14:50:58 +08:00
parent 24edddf932
commit 3935d557ef
7 changed files with 124 additions and 80 deletions
+11 -11
View File
@@ -144,17 +144,17 @@ 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);
// }
// }
// }
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)
{