wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2026-05-26 14:04:52 +08:00
commit 2f29a634d9
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -225,14 +225,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE
errorMsg = "题库中题目数量不足！\n" + errorMsg; errorMsg = "题库中题目数量不足！\n" + errorMsg;
throw new Exception(errorMsg); throw new Exception(errorMsg);
} }
#endregion #endregion
} }
#endregion #endregion
if (entity.ISSENDNOTICE) if (entity.ISSENDNOTICE)
{ {
entity.STATUS = SETrainNotifyStatus.通知中; entity.STATUS = SETrainNotifyStatus.通知中;
@ -245,13 +242,39 @@ namespace APT.SC.WebApi.Controllers.Api.SE
userFilter.Include = new string[] { "Nav_Person.Nav_Post", "Nav_Department" }; userFilter.Include = new string[] { "Nav_Person.Nav_Post", "Nav_Department" };
IEnumerable<T_FM_USER> userNames = GetEntities<T_FM_USER>(t => sendUserAll.Contains(t.ID), userFilter); IEnumerable<T_FM_USER> userNames = GetEntities<T_FM_USER>(t => sendUserAll.Contains(t.ID), userFilter);
T_FM_USER userCheck = null;
foreach (var user in Nav_TrainUserList) foreach (var user in Nav_TrainUserList)
{ {
if (user.IS_DELETED) if (user.IS_DELETED)
continue; continue;
userCheck = userNames.FirstOrDefault(t => t.ID == user.USER_ID);
if (userCheck == null)
{
var modelDel = GetEntity<T_FM_USER>(user.USER_ID);
if (modelDel != null && modelDel.IS_DELETED)
{
throw new Exception("人员【" + modelDel.NAME + " " + (String.IsNullOrEmpty(user.POST_NAME) ? "" : user.POST_NAME) + "】已删除，不能进行培训，请移除此人后再发布通知！");
}
else
{
throw new Exception("查找人员失败【ID：" + user.USER_ID + " " + (String.IsNullOrEmpty(user.POST_NAME) ? "" : user.POST_NAME) + "】失败，如果已删除活禁用，请移除此人！");
}
}
if (userCheck.Nav_Department == null)
{
throw new Exception("人员组织异常【" + userCheck.NAME + "】，请先处理对应组织后再提交！");
}
if (userCheck.Nav_Person == null)
{
throw new Exception("人员信息异常【" + userCheck.NAME + "】，请联系管理员处理对应信息！");
}
if (userCheck.Nav_Person.Nav_Post == null)
{
throw new Exception("人员岗位信息异常【" + userCheck.NAME + "】，请联系管理员处理对应信息！");
}
user.DEPARTMENT_NAME = userNames.FirstOrDefault(t => t.ID == user.USER_ID)?.Nav_Department?.NAME; user.DEPARTMENT_NAME = userCheck.Nav_Department?.NAME;
user.POST_NAME = userNames.FirstOrDefault(t => t.ID == user.USER_ID).Nav_Person?.Nav_Post?.NAME; user.POST_NAME = userCheck.Nav_Person?.Nav_Post?.NAME;
} }
foreach (var user in sendUsers) foreach (var user in sendUsers)
{ {