yanjinhui
6 天以前 0bc66c82a07c1b46a98ba7007b0a672fec02176e
ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -75,14 +75,14 @@
                        //"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),
                        _ => query.OrderByDescending((a, b) => b.Creater), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                        _ => query.OrderByDescending((a, b) => b.CreateDate), // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                    };
                }
                else
                {
                    //默认按创建时间降序排序
                    query = query.OrderByDescending((a, b) => b.Creater);
                    query = query.OrderByDescending((a, b) => b.CreateDate);
                }
                //// å¦‚果不是管理员,根据部门过滤
@@ -107,12 +107,14 @@
                var result=query
                .Select((a, b) => new
                {
                    a.User_Id,
                    //a.User_Id,
                    a.Dept_Id,//轨道站
                    a.IsLeader,//是否是班长
                    a.Role_Id,
                    a.RoleName,//角色名称
                    a.Unit,//单位
                    b.ID,
                    b.IPAddress,//电脑ip地址
                    b.OperatorName,//姓名
                    b.TeamName,//班组