diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/FMUserTransferController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/FMUserTransferController.cs index 1c8cdea..9e6bbce 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/FMUserTransferController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/FMUserTransferController.cs @@ -501,7 +501,10 @@ namespace APT.FM.WebApi.Controllers.Api.FM } entity.USER_ID = modelUOld.ID; entity.CREATE_TIME = DateTime.Now; - entity.USERNAME_TRANSFER = APT.Infrastructure.Api.AppContext.CurrentSession.UserName; + if (APT.Infrastructure.Api.AppContext.CurrentSession.UserID.HasValue) + { + entity.USERNAME_TRANSFER = GetEntity(e => e.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value)?.NAME; + } this.UnifiedCommit(() => { UpdateEntityNoCommit(entity); diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFAnnourcementController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFAnnourcementController.cs index 9c26826..2ccb8e5 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFAnnourcementController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/PFAnnourcementController.cs @@ -357,13 +357,16 @@ namespace APT.PF.WebApiControllers.Api.PF return SafeExecute(() => { var result = GetEntity(null, filter, null); + result.CREATE_USER_NAME = ""; if (result.CREATER_ID.HasValue) { - result.CREATE_USER_NAME = GetEntity(result.CREATER_ID.Value).NAME; - } - else - { - result.CREATE_USER_NAME = ""; + //try { result.CREATE_USER_NAME = GetEntity(result.CREATER_ID.Value).NAME; } + //catch { } + var conndefault = ConfigurationManager.ConnectionStrings["default"]; + using (var context = new MigrationContext(conndefault)) + { + result.CREATE_USER_NAME = context.GetEntity(e => e.ID == result.CREATER_ID.Value, null)?.NAME; + } } return result; }); @@ -383,7 +386,7 @@ namespace APT.PF.WebApiControllers.Api.PF DateTime dtS = DateTime.Now.Date; Expression> expression = e => !e.IS_DELETED && e.START <= dtS && e.ISPUBLISH; expression = expression.And(e => e.END == null || e.END >= dtS); - var result =GetOrderEntities(expression, pageFilter, null); + var result = GetOrderEntities(expression, pageFilter, null); return result; }); }