|
@@ -471,7 +471,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
|
|
Sys_JobPost job = _grpDeleRep._sqlSugar.Queryable<Sys_JobPost>().First(s => s.Id == user.JobPostId);
|
|
Sys_JobPost job = _grpDeleRep._sqlSugar.Queryable<Sys_JobPost>().First(s => s.Id == user.JobPostId);
|
|
info.CreateUser = string.Format(@"{0} - {1}", job?.JobName ?? "-", user.CnName);
|
|
info.CreateUser = string.Format(@"{0} - {1}", job?.JobName ?? "-", user.CnName);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
info.PriceModule = "邀请/公务活动";
|
|
info.PriceModule = "邀请/公务活动";
|
|
info.PriceName = _InvitationOfficialActivities.InviterArea;
|
|
info.PriceName = _InvitationOfficialActivities.InviterArea;
|
|
@@ -1058,7 +1058,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
|
|
|
|
|
|
#region 公务出访数据变更发送通知
|
|
#region 公务出访数据变更发送通知
|
|
/// <summary>
|
|
/// <summary>
|
|
- /// 机票行程代码录入变更通知发送国交经理、主管、王鸽
|
|
|
|
|
|
+ /// 机票行程代码录入变更通知发送国交经理、主管、王鸽、OP操作人员
|
|
/// </summary>
|
|
/// </summary>
|
|
/// <param name="diId"></param>
|
|
/// <param name="diId"></param>
|
|
/// <param name="operationId"></param>
|
|
/// <param name="operationId"></param>
|
|
@@ -1070,9 +1070,20 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
|
|
var operationName = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && s.Id == operationId).First()?.CnName ?? "Unknown";
|
|
var operationName = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && s.Id == operationId).First()?.CnName ?? "Unknown";
|
|
var defaultJobPostIds = new List<int>();
|
|
var defaultJobPostIds = new List<int>();
|
|
List<string> receivedUserIds = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && s.DepId == 7 && s.JobPostId == 28).Select(x => x.Id.ToString()).ToList();
|
|
List<string> receivedUserIds = _grpDeleRep.Query<Sys_Users>(s => s.IsDel == 0 && s.DepId == 7 && s.JobPostId == 28).Select(x => x.Id.ToString()).ToList();
|
|
- var defaultUserIds = new List<string>() { "208", "233" };
|
|
|
|
|
|
+ var defaultUserIds = new List<string>() { "208", "233", "235" };
|
|
receivedUserIds.AddRange(defaultUserIds);
|
|
receivedUserIds.AddRange(defaultUserIds);
|
|
|
|
|
|
|
|
+ #region 添加对应的OP操作人员
|
|
|
|
+ var groupModuleOperators = GeneralMethod.GetGroupModuleOperators(diId);
|
|
|
|
+ var opUserIds = groupModuleOperators
|
|
|
|
+ .Where(x => x.CTableId == 79)
|
|
|
|
+ .FirstOrDefault()?
|
|
|
|
+ .OperationUsers.Select(x => x.UserId.ToString())
|
|
|
|
+ .ToList();
|
|
|
|
+ receivedUserIds.AddRange(opUserIds ?? new List<string>());
|
|
|
|
+ receivedUserIds = receivedUserIds.Distinct().ToList();
|
|
|
|
+ #endregion
|
|
|
|
+
|
|
if (receivedUserIds.Count > 0)
|
|
if (receivedUserIds.Count > 0)
|
|
{
|
|
{
|
|
List<string> qwUserIdList = GetQiyeChatUserIdList(receivedUserIds);
|
|
List<string> qwUserIdList = GetQiyeChatUserIdList(receivedUserIds);
|