公司公告 报错处理
This commit is contained in:
parent
a22d98fb8a
commit
6b18de2898
@ -357,13 +357,16 @@ namespace APT.PF.WebApiControllers.Api.PF
|
|||||||
return SafeExecute(() =>
|
return SafeExecute(() =>
|
||||||
{
|
{
|
||||||
var result = GetEntity<T_PF_ANNOURCEMENT>(null, filter, null);
|
var result = GetEntity<T_PF_ANNOURCEMENT>(null, filter, null);
|
||||||
|
result.CREATE_USER_NAME = "";
|
||||||
if (result.CREATER_ID.HasValue)
|
if (result.CREATER_ID.HasValue)
|
||||||
{
|
{
|
||||||
result.CREATE_USER_NAME = GetEntity<T_FM_USER>(result.CREATER_ID.Value).NAME;
|
//try { result.CREATE_USER_NAME = GetEntity<T_FM_USER>(result.CREATER_ID.Value).NAME; }
|
||||||
}
|
//catch { }
|
||||||
else
|
var conndefault = ConfigurationManager.ConnectionStrings["default"];
|
||||||
{
|
using (var context = new MigrationContext(conndefault))
|
||||||
result.CREATE_USER_NAME = "";
|
{
|
||||||
|
result.CREATE_USER_NAME = context.GetEntity<T_FM_USER>(e => e.ID == result.CREATER_ID.Value, null)?.NAME;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
@ -383,7 +386,7 @@ namespace APT.PF.WebApiControllers.Api.PF
|
|||||||
DateTime dtS = DateTime.Now.Date;
|
DateTime dtS = DateTime.Now.Date;
|
||||||
Expression<Func<T_PF_ANNOURCEMENT, bool>> expression = e => !e.IS_DELETED && e.START <= dtS && e.ISPUBLISH;
|
Expression<Func<T_PF_ANNOURCEMENT, bool>> expression = e => !e.IS_DELETED && e.START <= dtS && e.ISPUBLISH;
|
||||||
expression = expression.And(e => e.END == null || e.END >= dtS);
|
expression = expression.And(e => e.END == null || e.END >= dtS);
|
||||||
var result =GetOrderEntities(expression, pageFilter, null);
|
var result = GetOrderEntities(expression, pageFilter, null);
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user