Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe
This commit is contained in:
commit
7a46f583d0
@ -142,7 +142,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
{
|
{
|
||||||
throw new Exception("通知人员不能为空");
|
throw new Exception("通知人员不能为空");
|
||||||
}
|
}
|
||||||
|
if (entity.CLASS_ID == null)
|
||||||
|
{
|
||||||
|
throw new Exception("班次不能为空");
|
||||||
|
//entity.START_TIME = DateTime.Now;
|
||||||
|
//entity.END_TIME = entity.START_TIME.AddHours(24);
|
||||||
|
}
|
||||||
if (entity.DEPARTMENT_ID == null)
|
if (entity.DEPARTMENT_ID == null)
|
||||||
{
|
{
|
||||||
var user = GetEntity<T_FM_USER>(t => t.ID == userID);
|
var user = GetEntity<T_FM_USER>(t => t.ID == userID);
|
||||||
@ -320,11 +325,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye);
|
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, eye);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (entity.CLASS_ID == null)
|
|
||||||
{
|
|
||||||
entity.START_TIME = DateTime.Now;
|
|
||||||
entity.END_TIME = entity.START_TIME.AddHours(24);
|
|
||||||
}
|
|
||||||
entity.Nav_User = null;
|
entity.Nav_User = null;
|
||||||
users.ForEach(t => t.Nav_User = null);
|
users.ForEach(t => t.Nav_User = null);
|
||||||
users.ForEach(t => t.ORG_ID = entity.ORG_ID);
|
users.ForEach(t => t.ORG_ID = entity.ORG_ID);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user