|
|
@@ -2835,9 +2835,9 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
|
|
|
|
|
|
var officialDutyData1 = officialDutyData.GroupBy(x => x.DiId)
|
|
|
.Select(g => new {
|
|
|
- diId = g.Key,
|
|
|
- groupName = g.FirstOrDefault()?.TeamName ?? "-",
|
|
|
- children = g.Select(g1 => new { oaId = g1.Id,client = g1.Client }).ToList()
|
|
|
+ id = g.Key,
|
|
|
+ label = g.FirstOrDefault()?.TeamName ?? "-",
|
|
|
+ children = g.Select(g1 => new { id = g1.Id, label = g1.Client }).ToList()
|
|
|
})
|
|
|
.ToList();
|
|
|
var view = new {
|
