修改bug

yanjinhui

6 天以前 0bc66c82a07c1b46a98ba7007b0a672fec02176e

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

@@ -38,11 +38,15 @@
                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))
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                   

                    query = query.Where((a, b) =>
                       b.OperatorName.Contains(pagination.searchKeyword) ||
                       b.TeamName.Contains(pagination.searchKeyword) ||
@@ -50,7 +54,7 @@
                   );
                }
                //时间查询
                if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
                }
@@ -68,34 +72,54 @@

                        //"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);
                }

                //// å¦‚果不是管理员，根据部门过滤
                //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
                var result = query
                .Select((a, b) => new
                {

                    b.ID,
                    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
                {
@@ -113,7 +137,7 @@
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false,Message="错误信息："+ex.Message };
                return new WebResponseContent { Status = false, Message = "错误信息：" + ex.Message };
            }

        }