This commit is contained in:
geh
2026-01-08 15:13:25 +08:00
parent 6bbf6d34b4
commit fb6c53dd62
4 changed files with 422 additions and 154 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)
{