|
|
@@ -1303,7 +1303,7 @@ WHERE
|
|
|
if (taskInfo != null)
|
|
|
{
|
|
|
var taskUserInfos = _taskAllocationRep._sqlSugar.Queryable<Pm_TaskRelevanceUser>().Where(it => it.TAId == dto.Id).ToList();
|
|
|
-
|
|
|
+
|
|
|
var taskUserIds = taskUserInfos.Select(it => it.UserId).ToList();
|
|
|
var taskUserIdStrs = taskUserInfos.Select(x => x.UserId.ToString()).ToList();
|
|
|
|
|
|
@@ -1336,7 +1336,7 @@ WHERE
|
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
public async Task<IActionResult> PostTaskAllocationSetAuditStatus(TaskAllocationSetAuditStatusDto dto)
|
|
|
{
|
|
|
- var _view = _taskAllocationRep.TaskSetAuditStatus(dto.Id, dto.UserId, dto.OverTime,dto.Remark);
|
|
|
+ var _view = _taskAllocationRep.TaskSetAuditStatus(dto.Id, dto.UserId, dto.OverTime, dto.Remark);
|
|
|
if (_view.Code == 0)
|
|
|
{
|
|
|
//发送消息
|
|
|
@@ -4573,6 +4573,13 @@ OPTION (MAXRECURSION 0); -- 允许无限递归 ";
|
|
|
}));
|
|
|
}
|
|
|
|
|
|
+ public class Setting
|
|
|
+ {
|
|
|
+ public int UP { get; set; }
|
|
|
+
|
|
|
+ public List<int> User { get; set; }
|
|
|
+ }
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// Ai绩效分析
|
|
|
/// 用户列表
|
|
|
@@ -4592,6 +4599,19 @@ OPTION (MAXRECURSION 0); -- 允许无限递归 ";
|
|
|
dto.PageSize = 10;
|
|
|
}
|
|
|
|
|
|
+ var setUserIds = new List<int>();
|
|
|
+ var setdata = _sqlSugar.Queryable<Sys_SetData>()
|
|
|
+ .First(x => x.Id == 1472 && x.IsDel == 0);
|
|
|
+ if (setdata != null && !string.IsNullOrEmpty(setdata.Remark))
|
|
|
+ {
|
|
|
+ var settting = JsonConvert.DeserializeObject<List<Setting>>(setdata.Remark) ?? new List<Setting>();
|
|
|
+ var dicSetting = settting.ToDictionary(x => x.UP, x => x.User);
|
|
|
+ if (dicSetting.ContainsKey(dto.UserId))
|
|
|
+ {
|
|
|
+ setUserIds = dicSetting[dto.UserId];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
RefAsync<int> total = 0;
|
|
|
|
|
|
var notidsJson = _sqlSugar.Queryable<Sys_SetData>().First(x => x.Id == 1463 && x.IsDel == 0)?.Remark;
|
|
|
@@ -4617,7 +4637,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归 ";
|
|
|
d.DepName.Contains(dto.ScreeningCriteria.Trim()) ||
|
|
|
jp.JobName.Contains(dto.ScreeningCriteria.Trim()) ||
|
|
|
SqlFunc.ToString(u.Id).Contains(dto.ScreeningCriteria.Trim()))
|
|
|
-
|
|
|
+ .WhereIF(setUserIds.Count > 0, u => setUserIds.Contains(u.Id))
|
|
|
.OrderBy(u => u.CompanyId)
|
|
|
.OrderBy(u => u.DepId)
|
|
|
.OrderBy(u => u.JobPostId)
|