当班工作记录非班组人员发起
This commit is contained in:
parent
6e0166b6bb
commit
2638d6650b
@ -78,8 +78,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
var currFMUser = GetEntity<T_FM_USER>((Guid)userID, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
|
var currFMUser = GetEntity<T_FM_USER>((Guid)userID, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent");
|
||||||
if (currFMUser != null)
|
if (currFMUser != null)
|
||||||
{
|
{
|
||||||
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
|
var team = GetEntity<T_FM_TEAM>(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID);
|
||||||
|
var depart = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currFMUser.DEPARTMENT_ID);
|
||||||
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
|
if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null)
|
||||||
{
|
{
|
||||||
if (team != null)
|
if (team != null)
|
||||||
@ -94,7 +94,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
if (entity.NAME == null)
|
if (entity.NAME == null)
|
||||||
{
|
{
|
||||||
isManual = true;
|
isManual = true;
|
||||||
entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
|
entity.NAME = DateTime.Now.ToShortDateString() + (team!=null?team?.NAME:depart?.NAME) + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录";
|
||||||
entity.RECORD_DATE = DateTime.Now;
|
entity.RECORD_DATE = DateTime.Now;
|
||||||
}
|
}
|
||||||
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
|
if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user