Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms
This commit is contained in:
commit
c24c1e1b4e
@ -254,7 +254,7 @@ namespace APT.FO.WebApi.Controllers
|
||||
T_FM_NOTIFICATION_TASK finishNotice = null;
|
||||
//细表
|
||||
List<T_PF_APPROVE_DETAIL> appdetails = new List<T_PF_APPROVE_DETAIL>();
|
||||
Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO017" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用;
|
||||
Expression<Func<T_PF_APPROVE_TEMP, bool>> express = t => t.FORM_CODE == "FO025" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用;
|
||||
if (!string.IsNullOrEmpty(param))
|
||||
express = express.And(t => t.PARAM == param);
|
||||
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(express, "Nav_ApproveTempDetails", "Nav_ApproveTempDetails.Nav_ApproveRole");
|
||||
@ -268,7 +268,7 @@ namespace APT.FO.WebApi.Controllers
|
||||
approve.Nav_ApproveDetails = null;
|
||||
approve.DATA_ID = id;
|
||||
approve.NAME = approveTemp.NAME;
|
||||
approve.APPROVE_CODE = "FO017_SHOWPRINT";
|
||||
approve.APPROVE_CODE = "FO025_SHOWPRINT";
|
||||
approve.CODE = serialCode;
|
||||
approve.CALLBACK_INTERFACE = approveTemp.CALLBACK_INTERFACE;
|
||||
var approveRoles = approveTemp.Nav_ApproveTempDetails.Where(t => t.APPROVE_ROLE_ID != null).Select(x => (Guid)x.APPROVE_ROLE_ID).Distinct().ToList();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user