|
@@ -2017,6 +2017,14 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
var data = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0).ToList();
|
|
|
var data1 = data.Where(a => a.STid == 38).Select(x => new { x.Id, x.Name }).ToList();
|
|
|
var data2 = data.Where(a => a.STid == 101).Select(x => new { x.Id, x.Name }).ToList();
|
|
|
+ //张总安排未参与对接
|
|
|
+ if (data2.Any(x => x.Name.Equals("张总安排未参与对接")))
|
|
|
+ {
|
|
|
+ var zhangZong = data2.FirstOrDefault(x => x.Name.Equals("张总安排未参与对接"));
|
|
|
+ if (zhangZong != null) data2.Remove(zhangZong);
|
|
|
+ data2.Insert(0, zhangZong);
|
|
|
+ }
|
|
|
+
|
|
|
var data3 = data.Where(a => a.STid == 66).Select(x => new { x.Id, x.Name, x.Remark }).ToList();
|
|
|
|
|
|
var _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
|
|
@@ -2026,7 +2034,15 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
var translatorData1 = _mapper.Map<List<TranslatorView>>(translatorData);
|
|
|
foreach (var item in translatorData1) EncryptionProcessor.DecryptProperties(item);
|
|
|
|
|
|
- return Ok(JsonView(true, "查询成功!", new { Delegation = groupInfos, SetData = data1, DataSource = data2, currencyData = data3, DeleFile = _DeleFile, TranslatorData = translatorData1 }));
|
|
|
+ return Ok(JsonView(true,
|
|
|
+ "查询成功!",
|
|
|
+ new { Delegation = groupInfos,
|
|
|
+ SetData = data1,
|
|
|
+ DataSource = data2,
|
|
|
+ currencyData = data3,
|
|
|
+ DeleFile = _DeleFile,
|
|
|
+ TranslatorData = translatorData1
|
|
|
+ }));
|
|
|
}
|
|
|
|
|
|
/// <summary>
|