1

yanjinhui

2025-06-16 a3b1d7bfe497ca5ece2a51eb15a5534a98b33dcb

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs

@@ -38,8 +38,12 @@
                var main = Db.Queryable<Dt_MaintenanceTeam>();



                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName)
                               ;


                //模糊查询
                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
                if (!string .IsNullOrEmpty(pagination.searchKeyword))
                {
                   
@@ -78,24 +82,43 @@
                    query = query.OrderByDescending((a, b) => b.Creater);
                }

                //// å¦‚果不是管理员，根据部门过滤
                //if (pagination.account != "admin")
                //{
                //    var currentUser = _user.Db.Queryable<Sys_User>()
                //        .Where(u => u.UserName == pagination.account)
                //        .First();

                //    if (currentUser == null)
                //    {
                //        return new WebResponseContent { Status = false, Data = "未获取到用户信息" };
                //    }

                //    int? deptId = currentUser.Dept_Id;

                //    query = query.Where((a, b) => a.Dept_Id == deptId);
                //}


                //返回结果
                var result=query
                .Select((a, b) => new
                {

                    a.User_Id,
                    a.Dept_Id,//轨道站
                    a.IsLeader,//是否是班长
                    a.RoleName,
                    a.Role_Id,
                    a.RoleName,//角色名称
                    a.Unit,//单位
                    b.IPAddress,//电脑ip地址
                    b.OperatorName,
                    b.TeamName,
                    b.TeamName,//班组
                    b.MaintenanceStatus,//检修状态
                    b.Creater,
                    a.HeadImageUrl,
                    b.DistributionTime,
                    b.EndTime,
                    b.Modifier,

                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {